28 files changed, 55550 insertions, 71842 deletions

diff --git a/Makefile.am b/Makefile.am
index 17bfb1a6a2..31b5b8483d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,5 @@ SUBDIRS =			\
 	ui			\
         default_user            \
         tools                   \
-        po                      \
-        doc
-
+        po          
 
diff --git a/po/ChangeLog b/po/ChangeLog
index bb2192d82d..5903596d26 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-17  Dave Camp <dave@ximian.com>
+
+	* POTFILES.in: Removed addressbook/gui/widgets/test-minicard-view.c,
+	camel/providers/local/camel-mbox-provider.c, 
+	notes/component-factory.c, notes/main.c, and 
+	calendar/gui/gnome-month-item.c, and calendar/gui/alarm-notify.c.
+
 2001-01-17  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88acf28b21..25f96b6a8c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,5 @@
 ui/evolution-executive-summary.xml
 executive-summary/component/component-factory.c
-addressbook/gui/widgets/test-minicard-view.c
-camel/providers/local/camel-mbox-provider.c
 camel/providers/vee/camel-vee-folder.c
 executive-summary/component/e-summary-callbacks.c
 executive-summary/component/e-summary-url.c
@@ -9,8 +7,6 @@ executive-summary/component/e-summary.c
 executive-summary/component/main.c
 executive-summary/test-service/rdf-summary.c
 mail/mail-config.c
-notes/component-factory.c
-notes/main.c
 ui/evolution-task-editor-dialog.xml
 ui/evolution-tasks.xml
 addressbook/backend/ebook/e-card-simple.c
@@ -44,7 +40,6 @@ calendar/conduits/calendar/calendar-conduit-control-applet.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/todo/todo-conduit-control-applet.c
 calendar/conduits/todo/todo-conduit.c
-calendar/gui/alarm-notify.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
 calendar/gui/calendar-summary.c
@@ -66,7 +61,6 @@ calendar/gui/e-week-view.c
 calendar/gui/event-editor-dialog.glade
 calendar/gui/event-editor.c
 calendar/gui/gnome-cal.c
-calendar/gui/gnome-month-item.c
 calendar/gui/goto.c
 calendar/gui/goto-dialog.glade
 calendar/gui/main.c
diff --git a/po/ca.po b/po/ca.po
index a015466789..f838bae090 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,11 +4,11 @@
 #
 # TraducciС per SoftcatalЮ <linux@softcatala.org>
 # Traductor original: VМctor Nieto <vnie2025@alu-etsetb.upc.es>
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -16,208 +16,384 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "Fitxers de correu en format mbox d'UNIX"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "L'ordinador central %s no existeix."
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "S'estЮ recollint el correu des de %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Tanca"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mou a la carpeta"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "VИs a l'element anterior"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "VИs a l'element segЭent"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configura la carpeta"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"No s'ha pogut obrir el fitxer %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "ConnexiС de prova a \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nou"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Crea un nou contacte"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "PaМ_s:"
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 #, fuzzy
 msgid ""
 "\n"
@@ -234,30 +410,19 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 #, 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -379,40 +544,32 @@ msgstr ""
 "S'ha produОt un error en intentar recollir\n"
 "la llista del Pilot del dimoni gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'adreГa del Pilot"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Voleu suprimir el contacte?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -422,7 +579,7 @@ msgid "_Add"
 msgstr "_Afegeix"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -435,14 +592,7 @@ msgstr "Tipus de telХfon"
 msgid "New phone type"
 msgstr "Nou tipus de telХfon"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Afegeix"
 
@@ -500,7 +650,6 @@ msgid "C_ontacts..."
 msgstr "C_ontactes..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
@@ -517,8 +666,6 @@ msgid "_Address..."
 msgstr "_AdreГa..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "General"
 
@@ -563,24 +710,27 @@ msgid "No_tes:"
 msgstr "No_tes:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalls"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Feina"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Feina 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
@@ -589,6 +739,7 @@ msgid "Callback"
 msgstr "Crida de retorn"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Cotxe"
 
@@ -598,28 +749,33 @@ msgstr "Empresa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax particular"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "XDSI"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "MРbil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Altres"
 
@@ -628,10 +784,12 @@ msgid "Other Fax"
 msgstr "Un altre fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Busca"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Primari"
 
@@ -648,62 +806,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "AdreГa electrРnica 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "AdreГa electrРnica 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "AdreГa _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "CanadЮ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Comprova l'adreГa"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "PaМ_s:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "FinlЮndia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "EUA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_AdreГa:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_PoblaciС:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Apartat de correus:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Comarca:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Codi postal:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -769,12 +881,7 @@ msgstr "_Sufix:"
 msgid "As _Minicards"
 msgstr "Com a _Minicards"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Com a _taula"
 
@@ -808,32 +915,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:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos contИ"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 #, fuzzy
 msgid "Name contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrarЮ el navegador de carpetes"
 
@@ -862,9 +969,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -900,12 +1007,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Hores"
@@ -925,12 +1030,10 @@ msgid "Search Scope:"
 msgstr "Cerca"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaciС:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "CamМ:"
 
@@ -956,192 +1059,89 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Nom:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "DescripciС:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Afegeix una font"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Edita"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Cerca..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Destinataris del missatge"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Seleccioneu un nom de la llista:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Cerca"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Nom"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "AdreГa electrРnica 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "OrganitzaciС"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_Departament:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Oficina"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_TМtol:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_ProfessiС:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Busca"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_CРnjuge:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Desa com a VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1155,179 +1155,6 @@ msgstr ""
 "\n"
 "Feu doble clic aquМ per crear un nou contacte."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Formularis en blanc al final:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Cos"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Inferior:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensions:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Lletra..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Lletres"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Peu de pЮgina:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "CapГalera"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "CapГalera/Peu de pЮgina"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "EncapГalaments"
-
-#: addressbook/printing/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:20
-msgid "Height:"
-msgstr "AlГada:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Un segueix immediatament l'altre"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Inclou:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Horitzontal"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Esquerra:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Tabuladors de carta al costat"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marges"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Nombre de columnes:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Opcions"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "OrientaciС"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "PЮgina"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "ConfiguraciС de la pЮgina:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Paper"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Font del paper:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Vertical"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "PrevisualitzaciС:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Imprimeix usant ombrejat de grisos"
-
-#: addressbook/printing/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:38
-msgid "Right:"
-msgstr "Dreta:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Seccions:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Ombrejat"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Mida:"
-
-#: addressbook/printing/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:43
-msgid "Style name:"
-msgstr "Nom de l'estil:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Superior:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Tipus:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Amplada:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "etiqueta26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conducte de l'agenda de l'Evolution"
@@ -1336,13 +1163,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'agenda del Pilot"
 
@@ -1356,74 +1183,17 @@ msgstr ""
 "Utilitat de configuraciС per al conducte de les coses per fer de "
 "l'Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 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"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Agenda"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Recordatori de la vostra cita a "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "'Snooze'"
 
@@ -1433,25 +1203,25 @@ msgstr "'Snooze'"
 msgid "Ok"
 msgstr "D'acord"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1459,60 +1229,57 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "PЗblic"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1524,7 +1291,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1532,27 +1299,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1562,860 +1329,421 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritat ha d'estar entre 1 i 9, ambdСs inclosos"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_VisualitzaciС"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Mostra les _adjuncions"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarЮ l'agenda"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Tanca"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Edita una cita"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Durada de l'snooze (minuts)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 hores (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 hores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minuts"
-
-#: calendar/gui/dialogs/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:14
-msgid "Audio Alarms"
-msgstr "Alarmes acЗstiques"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Fes un so quan aparegui una finestra d'alarma."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Agenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "PreferХncies de l'agenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Colors"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Comprimeix els caps de setmana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Opcions del navegador de dates"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Valors predeterminats"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Opcions de visualitzaciС"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Data de venciment"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Habilita l'snoozing per a"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Final del dia:"
-
-#: calendar/gui/dialogs/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:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "dv."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "Divendres"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Ressalta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Elemts que vencen avui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Elements que vencen avui:"
-
-#: calendar/gui/dialogs/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:33
-msgid "Items Not Yet Due:"
-msgstr "Elements que encara no han venГut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "dl."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Dilluns"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "Elements venГuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Elements que ja han venГut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Agafa un color"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioritat"
-
-#: calendar/gui/dialogs/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:41
-msgid "Reminders"
-msgstr "Recordatoris"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "ds."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/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:46
-msgid "Show week numbers"
-msgstr "Mostra els nЗmeros de les setmanes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Inici del dia:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "dg."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "TaskPad"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "dj."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Dijous"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "Temps fins al venciment"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Divisions de temps:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Format de l'hora:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "dm."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Alarmes visuals"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "dc."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Setmana de treball"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minuts abans que es produeixin."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "segons."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "C_lassificaciС:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Cancel╥lat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Completat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Data completa:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "En procИs"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Baixa"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Cap"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "No iniciat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "R_esum"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Data d'ini_ci:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Tasca"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Contactes..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr "_Data de venciment:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Prioritat:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_Estat:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "categories"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "ClassificaciС"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Completat"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Hora de _finalitzaciС:"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Data d'ini_ci:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Data de venciment"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Marca la tasca com a completa"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritat"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "R_esum"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Transparent"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "_Obre..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Obre la tasca"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Edita aquesta cita..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Suprimeix-ne aquesta apariciС"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#. 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"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/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:8
-msgid "Appointment Basics"
-msgstr "Temes fonamentals sobre les cites"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "ClassificaciС"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr "RecurrХncia personalitzada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Dies"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "Excepcions"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Hores"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "Envia per correu _a:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Minuts"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "Modifica"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Sense recurrХncia"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Preview"
-msgstr "PrevisualitzaciС:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "PЗ_blic"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "RecurrХncia"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "Regla de recurrХncia"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "Recordatori"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "RecurrХncia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr "Resu_m:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Temps"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_юudio"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_VisualitzaciС"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "Hora de _finalitzaciС:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_Correu"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Programa"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "_Executa el programa:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "Hora d'_inici:"
+msgid "Category:"
+msgstr "categories"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Data d'_inici:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dia(es)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#. 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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr "per a"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Edita una cita"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr "per sempre"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "el"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "etiqueta21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dia"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "mes(os)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Dilluns"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "fins a"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Dimarts"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "setmana(es)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Dimecres"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "any(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Dijous"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "Edita una cita"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Divendres"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr "el"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Dissabte"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Diumenge"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "No s'ha pogut carregar l'agenda en `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "No s'ha pogut crear una agenda a `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"No s'ha pogut obrir la carpeta `%s':\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "abril"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "agost"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "desembre"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "febrer"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "VИs a una data"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "VИs a avui"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "gener"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "juliol"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "dg."
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "juny"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "dl."
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "marГ"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "dm."
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Dilluns"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "dc."
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "novembre"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "dj."
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "octubre"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "dv."
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "setembre"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "ds."
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -2608,10 +1936,15 @@ msgstr "Enguany (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "PrevisualitzaciС d'impressiС"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "La URI que mostrarЮ l'agenda"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 #, fuzzy
 msgid "SMTWTFS"
@@ -2706,61 +2039,69 @@ 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:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Cancel╥lat"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, 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:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Obre l'agenda"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camМ"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, 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:297
+#: camel/camel-session.c:299
 #, 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:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2769,17 +2110,17 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La cadena d'URL `%s' no contИ cap protocol"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La cadena d'URL `%s' contИ un protocol incorrecte"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, 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"
@@ -2796,41 +2137,42 @@ msgstr "No s'ha pogut crear el conducte: %s"
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 #, 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:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, 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:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, 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:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -2842,17 +2184,17 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 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:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 #, fuzzy
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
@@ -2860,12 +2202,12 @@ msgstr ""
 "AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, 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:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2876,14 +2218,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
 #, fuzzy
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2891,9 +2233,8 @@ 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"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
@@ -2901,7 +2242,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3245,8 +2586,8 @@ msgstr ""
 "Aquesta opciС us autentica al servidor NNTP mitjanГant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, 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"
@@ -3278,7 +2619,7 @@ msgstr ""
 "recuperar correu des de determinats proveОdors de correu web i sistemes "
 "propietaris de correu."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3286,7 +2627,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:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3296,29 +2637,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:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 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:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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:375
 #, 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:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3327,12 +2668,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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3340,7 +2681,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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3349,13 +2690,12 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3406,29 +2746,24 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjanГant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
 #, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Per al lliurament de correu mitjanГant la connexiС a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3437,13 +2772,12 @@ msgstr ""
 "Aquesta opciС us connectarЮ al sevidor POP mitjanГant una contrasenya en "
 "text net. иs l'Зnica suportada per molts servidors POP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
@@ -3451,96 +2785,96 @@ msgstr ""
 "AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjanГant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3583,12 +2917,11 @@ msgid "attachment"
 msgstr "adjunciС"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Elimina"
 
@@ -3604,56 +2937,40 @@ msgstr "Afegeix una adjunciС..."
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Propietats de l'adjunciС"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nom del fitxer:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Tipus de MIME:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "IntroduОu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3661,11 +2978,11 @@ 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "IntroduОu l'assumpte del correu"
 
@@ -3678,38 +2995,38 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "S'estan desant els canvis al missatge..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Desa els canvis al missatge..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error en desar la redacciС a 'Esborranys': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3719,27 +3036,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no Иs habitual."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Aquest fitxer existeix perР no es pot llegir."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3747,28 +3064,23 @@ msgstr ""
 "El fitxer Иs molt gran (mИs de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "S'ha produОt un error en llegir el fitxer."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, 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 "year"
 msgstr "any"
@@ -3902,7 +3214,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Agrupament"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Filtres d'ediciС"
 
@@ -4003,194 +3315,171 @@ msgstr ""
 msgid "Read"
 msgstr "RЮdio"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Edita les VFolders"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Regles del filtre"
-
-#: filter/filter.glade.h:12
-#, fuzzy
-msgid "Incoming"
-msgstr ""
-"Entrant\n"
-"Sortint\n"
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "Contorn:"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Carpetes virtuals"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Fonts de la vFolder"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "desprИs de"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigna una puntuaciС"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "abans de"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "contИ"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data de recepciС"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data d'enviament"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "ExpressiС"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Reenvia-ho a l'adreГa"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Cos del missatge"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "no contИ"
+#, fuzzy
+msgid "Message Header"
+msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "no acaba amb "
+msgid "Message was received"
+msgstr "S'ha rebut el missatge"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "no existeix"
+msgid "Message was sent"
+msgstr "S'ha enviat el missatge"
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
+msgid "Move to Folder"
+msgstr "Mou a la carpeta"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "no comenГa per"
+msgid "Recipients"
+msgstr "Destinataris"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "acaba amb"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "existeix"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "PuntuaciС"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "ExpressiС"
+msgid "Sender"
+msgstr "Remitent"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adreГa"
+#, fuzzy
+msgid "Set Status"
+msgstr "Estat de la connexiС"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "Иs"
+msgid "Source"
+msgstr "Font"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "Иs mИs gran que"
+msgid "Specific header"
+msgstr "Especifiqueu la capГalera"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "Иs mИs petit que"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "no Иs"
+msgid "Stop Processing"
+msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Cos del missatge"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Assumpte"
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "Message Header"
-msgstr "Cos del missatge"
+msgid "after"
+msgstr "desprИs de"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "S'ha rebut el missatge"
+msgid "before"
+msgstr "abans de"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "S'ha enviat el missatge"
+msgid "contains"
+msgstr "contИ"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Mou a la carpeta"
+msgid "does not contain"
+msgstr "no contИ"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "el o desprИs del"
+msgid "does not end with"
+msgstr "no acaba amb "
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "el o abans del"
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Destinataris"
+msgid "does not start with"
+msgstr "no comenГa per"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "acaba amb"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Remitent"
+msgid "exists"
+msgstr "existeix"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "Estat de la connexiС"
+msgid "is greater than"
+msgstr "Иs mИs gran que"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "Иs mИs petit que"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Font"
+msgid "is not"
+msgstr "no Иs"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Especifiqueu la capГalera"
+msgid "is"
+msgstr "Иs"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "comenГa per"
+msgid "on or after"
+msgstr "el o desprИs del"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
+msgid "on or before"
+msgstr "el o abans del"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Atura el processament"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Assumpte"
+msgid "starts with"
+msgstr "comenГa per"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4208,10 +3497,6 @@ msgstr "Afegeix una regla"
 msgid "Edit Score Rule"
 msgstr "Edita la regla de puntuaciС"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "PuntuaciС"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Afegeix una regla de la VFolder"
@@ -4220,224 +3505,173 @@ msgstr "Afegeix una regla de la VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Edita una regla de la VFolder"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Desa"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "El cos o l'assumpte contenen"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "El cos contИ"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "L'assumpte contИ"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "El cos no contИ"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "L'assumpte no contИ"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Mostra"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Amaga"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Suprimeix"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Assumpte"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Filtre sobre el remitent"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Edita"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Imprimeix"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "VИs endavant en el temps"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, 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:690
+#: mail/folder-browser.c:678
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Mou el missatge"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Assumpte"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "No s'ha pogut iniciar el wombat"
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "Format"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Cap"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "Tipus de font de notМcies:"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "Valors predeterminats"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Conducte de les coses per fer de l'Evolution"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4459,7 +3693,7 @@ msgstr "Correu de %s"
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4471,7 +3705,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4479,7 +3713,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4487,19 +3721,15 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: 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:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mХtode de transport de correu"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "No teniu configurada cap bЗstia de sortida"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4507,24 +3737,31 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Cal que configureu una identitat\n"
+"abans de poder redactar correu."
+
+#: mail/mail-callbacks.c:365
 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:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4532,11 +3769,11 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4544,17 +3781,17 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4563,476 +3800,32 @@ msgstr ""
 "Error en carregar la informaciС del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressiС del missatge"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Cap informaciС"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Propietats de l'adjunciС"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Afegeix..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "AutenticaciС:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "AutenticaciС:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Valors predeterminats"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "No suprimeixis els missatges del servidor"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Cap"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "AdreГa electrРnica:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "AdreГa electrРnica:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraciС del correu"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Nom complet:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Nom d'usuari:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Identitat"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_Correu"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "contИ"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "ConfiguraciС del correu"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "ConfiguraciС del correu"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Nou"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Opcions"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganitzaciС:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "Contrasenya"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Respon"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "Persones _requerides"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Desa com a VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "ConfiguraciС del correu"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Servidor:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Servidor:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fonts"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Tipus:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Cap informaciС"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minuts"
-
-#: 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 ""
-"IntroduОu el vostre nom i adreГa electrРnica que es farЮ servir al correu "
-"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:446
-msgid "Full name:"
-msgstr "Nom complet:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "AdreГa electrРnica:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Fitxer de signatura"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Servidor:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Detecta els tipus suportats..."
-
-#: 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:1003
-msgid "Test Settings"
-msgstr "ParЮmetres de prova"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Tipus de font del correu:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:363
+#, c-format
 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."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
-"informaciС corresponent.\n"
-"\n"
-"Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
-"tipus suportats...\" desprИs d'introduir l'altra informaciС."
 
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Tipus de font de notМcies:"
-
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:629
+#, c-format
 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."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Seleccioneu el tipus del vostre servidor de notМcies, i introduОu-ne la "
-"informaciС corresponent.\n"
-"Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
-"tipus suportats...\" desprИs d'introduir l'altra informaciС."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Tipus de transport de correu:"
 
-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
-"informaciС corresponent.\n"
-"\n"
-"Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
-"tipus suportats...\" desprИs d'introduir l'altra informaciС."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Afegeix una identitat"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Edita la identitat"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Afegeix una font"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Edita la font"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Afegeix un servidor de notМcies"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Edita el servidor de notМcies"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "S'estЮ comprovant \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "ConnexiС de prova a \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "La connexiС ha tingut Хxit!"
-
-#: 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:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "AutoritzaciС de consultes a \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "AdreГa"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "Identitats"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Fonts del correu"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transport de correu"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Marca el missatge com a vist [ms]: "
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Servidors de notМcies"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Fonts de notМcies"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "OrganitzaciС"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Envia els missatges en format HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "No s'ha indicat cap contrasenya."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -5070,67 +3863,68 @@ msgstr "Obre a %s..."
 msgid "View Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en lМnia (mitjanГant %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunciС"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5193,7 +3987,7 @@ msgstr "CreaciС d'una nova carpeta"
 msgid "Register local folder"
 msgstr "Crea una carpeta nova"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5223,161 +4017,161 @@ msgstr ""
 msgid "Working"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "S'estЮ recollint el correu des de %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recull el correu des de %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hi ha nou correu a %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "S'estЮ filtrant el correu sota demanda"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtra el correu sota demanda"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "S'estЮ enviant la cua"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Envia la cua"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "S'estЮ afegint \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "S'estЮ afegint un missatge sense cap assumpte"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, 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:899
+#: mail/mail-ops.c:914
 #, 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:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mou els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "S'estЮ copiant"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Sense descripciС)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'estЮ esborrant \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "S'estЮ carregant la carpeta %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Carrega la carpeta %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5389,7 +4183,7 @@ msgstr "Error en desar el fitxer: %s"
 msgid "Cancel"
 msgstr "Cancel╥lat"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "S'ha escrit un missatge incomplet al conducte!"
 
@@ -5499,117 +4293,194 @@ msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Desconegut"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "adjunciС"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Data de venciment"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Data de recepciС"
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Per a"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Mida"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "No hi ha cap programa GPG/PGP disponible."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "No s'ha indicat cap contrasenya."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Carpetes"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "PuntuaciС"
+
+#: mail/subscribe-dialog.c:145
 #, fuzzy
 msgid "Display folders starting with:"
 msgstr "Visualitza les carpetes que continguin:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Escaneja les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
@@ -5721,23 +4592,24 @@ msgstr ""
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sense tМtol)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5747,7 +4619,7 @@ 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:334
 msgid "Go to folder..."
 msgstr "VИs a la carpeta..."
 
@@ -5755,13 +4627,18 @@ msgstr "VИs a la carpeta..."
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Carpetes"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5769,7 +4646,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5778,15 +4655,15 @@ msgstr ""
 "Ep!  La visualitzaciС de `%s' s'ha mort inesperadament.  :-(\n"
 "AixР segurament vol dir que el component %s ha petat."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5795,51 +4672,61 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Mostra la barra de _dreceres"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Mostra la barra de _dreceres"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activa"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activa aquesta drecera"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
@@ -5847,12 +4734,11 @@ msgstr "Elimina aquesta drecera de la barra de dreceres"
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Visualitza"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
@@ -5969,1312 +4855,2025 @@ msgstr "Inhabilitat"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Crea un nou contacte"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Cita"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Suprimeix un contacte"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Pe_ticiС de cita"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Cerca"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Cerca un contacte"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contacte"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nou"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Tasca"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Imprimeix els contactes"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: _PeticiС de tasca"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Atura"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Entrada al _diari"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Atura la cЮrrega"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Nota"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Visualitza'ls tots"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Tr_ia el formulari..."
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Visualitza tots els contactes"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Estil _memo"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "ConfiguraciС del _correu..."
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Defineix els e_stils d'impressiС..."
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Imprimeix els contactes..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: E_nvia"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Cerca contactes"
+#: ui/evolution-contact-editor.xml:35
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Invita els assistents..."
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Eines"
+#: ui/evolution-contact-editor.xml:38
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "_Mou a la carpeta"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 dies"
+#: ui/evolution-contact-editor.xml:39
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Tr_ia el formulari..."
+
+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
+msgstr "Con_figuraciС de la pЮgina"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Modifica les preferХncies"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Pre_visualitzaciС de la impressiС"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Agenda"
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Enganxa e_special..."
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "PreferХncies de l'agenda..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Crea una nova cita"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objecte"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Crea una nova agenda"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: _Element"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dia"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Element per _llegir"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "VИs enrera en el temps"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Pr_imer element de la carpeta"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "VИs endavant en el temps"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _зltim element de la carpeta"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "VИs a"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: E_stЮndard"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "VИs a una data concreta"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: S'estЮ __formatant"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "VИs al present"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Personalitza..."
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mes"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Ant_erior"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr "SegЭent"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "Se_gЭent"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Obre una agenda"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Barres d'eines"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Anterior"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _Fitxer..."
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Imprimeix aquest agenda"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: El_ement..."
 
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Save calendar as something else"
-msgstr "Deixa l'agenda com a alguna altra cosa"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objecte..."
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Mostra 1 dia"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Lletra..."
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Mostra 1 mes"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _ParЮgraf..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Mostra 1 setmana"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Diss_enya aquest formulari"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Mostra la setmana de treball"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: D_issenya un formulari..."
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Avui"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publica el _formulari..."
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Setmana"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blica el formulari com a..."
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nou"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: _Depurador de seqЭХncies"
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Obre una agenda"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Ortografia..."
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Imprimeix aquest agenda"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formularis"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "Anomena i desa..."
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "FIXME: Contacte _nou"
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Suprimeix aquest element"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "FIXME: Nou _contacte de la mateixa empresa"
 
-#: ui/evolution-contact-editor.xml.h:8
-#, fuzzy
-msgid "Delete..."
-msgstr "Suprimeix"
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: Nova _carta per contactar"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml:146
 #, fuzzy
-msgid "Help"
-msgstr "_Ajuda"
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: Nova _carta per contactar"
 
-#: ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Print En_velope..."
-msgstr "Imprimeix el missatge..."
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Nova cit_a amb contacte"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Imprimeix aquest element"
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _Prepara una cita..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Imprimeix..."
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: Nova _tasca per contactar"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-#, fuzzy
-msgid "Save _As..."
-msgstr "Anomena i desa..."
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: Nova entrada al _diari per contactar"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Desa i tanca"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: _Assenyala per al seguiment..."
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de diЮleg"
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: _Mostra el mapa de l'adreГa"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: _Obre la pЮgina web"
+
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Reenvia com a _vCard"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Consulta l'ajuda en lМnia"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: Reen_via"
 
-#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml:169
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "FIXME: Nou _missatge per contactar"
+msgid "_Insert"
+msgstr "_мndex"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Fitxer"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Eines"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml:172
 #, fuzzy
-msgid "_Print..."
-msgstr "Imprimeix..."
+msgid "Actio_ns"
+msgstr "_Accions"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Desa"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "FIXME: Anterior"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "VИs a l'element anterior"
+
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "FIXME: SegЭent"
+
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "VИs a l'element segЭent"
+
+#. 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:2471
+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"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupat"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Fora de l'oficina"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Cap informaciС"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Invita a altres..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opcions"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Mostra _nomИs les hores de treball"
 
-#: ui/evolution-event-editor.xml.h:7
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Mostra-ho reduint el zoom"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Actualitza lliure/ocupat"
+
+#: 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 "Tria automЮtica"
+
+#: 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 "_Totes les persones i recursos"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Totes les persones i un recurs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Persones _requerides"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Persones requerides i _un recurs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora d'_inici de la reuniС:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora de _finalitzaciС de la reuniС:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Tots els assistents"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "DDDDDDD"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Ara"
+
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Avui"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#: widgets/misc/e-search-bar.c:176
 #, fuzzy
-msgid "About..."
-msgstr "Lletra..."
+msgid "Sear_ch"
+msgstr "Cerca"
+
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grup %i"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Voleu suprimir el contacte?"
+
+#~ msgid "Address _2:"
+#~ msgstr "AdreГa _2:"
+
+#~ msgid "Canada"
+#~ msgstr "CanadЮ"
+
+#~ msgid "Check Address"
+#~ msgstr "Comprova l'adreГa"
+
+#~ msgid "Countr_y:"
+#~ msgstr "PaМ_s:"
+
+#~ msgid "Finland"
+#~ msgstr "FinlЮndia"
+
+#~ msgid "USA"
+#~ msgstr "EUA"
+
+#~ msgid "_Address:"
+#~ msgstr "_AdreГa:"
+
+#~ msgid "_City:"
+#~ msgstr "_PoblaciС:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "_Apartat de correus:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "_Comarca:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Codi postal:"
 
-#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
-msgid "Actio_ns"
-msgstr "_Accions"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Afegeix una font"
+
+#~ msgid "Find..."
+#~ msgstr "Cerca..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "Destinataris del missatge"
+
+#~ msgid "Select Names"
+#~ msgstr "Seleccioneu els noms"
 
-#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
-msgid "C_lear"
-msgstr "Agenda"
+#~ msgid "Select name from:"
+#~ msgstr "Seleccioneu un nom de la llista:"
+
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Formularis en blanc al final:"
+
+#~ msgid "Body"
+#~ msgstr "Cos"
+
+#~ msgid "Bottom:"
+#~ msgstr "Inferior:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensions:"
+
+#~ msgid "Font..."
+#~ msgstr "Lletra..."
+
+#~ msgid "Fonts"
+#~ msgstr "Lletres"
+
+#~ msgid "Footer:"
+#~ msgstr "Peu de pЮgina:"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Header"
+#~ msgstr "CapГalera"
+
+#~ msgid "Header/Footer"
+#~ msgstr "CapГalera/Peu de pЮgina"
+
+#~ msgid "Headings"
+#~ msgstr "EncapГalaments"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "EncapГalaments per a cada carta"
+
+#~ msgid "Height:"
+#~ msgstr "AlГada:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Un segueix immediatament l'altre"
+
+#~ msgid "Include:"
+#~ msgstr "Inclou:"
+
+#~ msgid "Landscape"
+#~ msgstr "Horitzontal"
+
+#~ msgid "Left:"
+#~ msgstr "Esquerra:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Tabuladors de carta al costat"
+
+#~ msgid "Margins"
+#~ msgstr "Marges"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Nombre de columnes:"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "Orientation"
+#~ msgstr "OrientaciС"
+
+#~ msgid "Page"
+#~ msgstr "PЮgina"
+
+#~ msgid "Page Setup:"
+#~ msgstr "ConfiguraciС de la pЮgina:"
+
+#~ msgid "Paper"
+#~ msgstr "Paper"
+
+#~ msgid "Paper source:"
+#~ msgstr "Font del paper:"
+
+#~ msgid "Portrait"
+#~ msgstr "Vertical"
+
+#~ msgid "Preview:"
+#~ msgstr "PrevisualitzaciС:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Imprimeix usant ombrejat de grisos"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Inverteix-ho per a les pЮgines senars"
+
+#~ msgid "Right:"
+#~ msgstr "Dreta:"
+
+#~ msgid "Sections:"
+#~ msgstr "Seccions:"
+
+#~ msgid "Shading"
+#~ msgstr "Ombrejat"
+
+#~ msgid "Size:"
+#~ msgstr "Mida:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ComenГa en una nova pЮgina"
+
+#~ msgid "Style name:"
+#~ msgstr "Nom de l'estil:"
+
+#~ msgid "Top:"
+#~ msgstr "Superior:"
+
+#~ msgid "Type:"
+#~ msgstr "Tipus:"
+
+#~ msgid "Width:"
+#~ msgstr "Amplada:"
+
+#~ msgid "label26"
+#~ msgstr "etiqueta26"
 
-#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
-msgid "C_ut"
-msgstr "Personalitzat"
+#~ msgid "Calendar Server"
+#~ msgstr "Agenda"
 
-#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
-msgid "Clear"
-msgstr "Agenda"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr ""
+#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
-msgid "Clear the selection"
-msgstr "_Inverteix la selecciС"
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Conducte de l'agenda de l'Evolution"
 
-#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Suprimeix aquesta cita"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr ""
+#~ "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copia"
+#~ msgid "Edit appointment"
+#~ msgstr "Edita una cita"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Durada de l'snooze (minuts)"
 
-#: ui/evolution-event-editor.xml.h:17
-#, fuzzy
-msgid "Cut"
-msgstr "Personalitzat"
+#~ msgid "05 minutes"
+#~ msgstr "05 minuts"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr ""
+#~ msgid "10 minutes"
+#~ msgstr "10 minuts"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 hores (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#~ msgid "15 minutes"
+#~ msgstr "15 minuts"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Llibreta d'adreces..."
+#~ msgid "24 hour"
+#~ msgstr "24 hores"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Tr_ia el formulari..."
+#~ msgid "30 minutes"
+#~ msgstr "30 minuts"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Comp_rova els noms"
+#~ msgid "60 minutes"
+#~ msgstr "60 minuts"
 
-#: ui/evolution-event-editor.xml.h:26
-#, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Tr_ia el formulari..."
+#~ msgid "Alarms timeout after"
+#~ msgstr "Les alarmes es desactiven desprИs de"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: D_issenya un formulari..."
+#~ msgid "Audio Alarms"
+#~ msgstr "Alarmes acЗstiques"
 
-#: ui/evolution-event-editor.xml.h:28
-#, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Defineix els e_stils d'impressiС..."
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Diss_enya aquest formulari"
+#~ msgid "Calendar"
+#~ msgstr "Agenda"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pr_imer element de la carpeta"
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferХncies de l'agenda"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: Reen_via"
+#~ msgid "Colors"
+#~ msgstr "Colors"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Reenvia com a v_Calendar"
+#~ msgid "Compress weekends"
+#~ msgstr "Comprimeix els caps de setmana"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Ajuda"
+#~ msgid "Date navigator options"
+#~ msgstr "Opcions del navegador de dates"
 
-#: ui/evolution-event-editor.xml.h:34
-#, fuzzy
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: _Tasca"
+#~ msgid "Defaults"
+#~ msgstr "Valors predeterminats"
 
-#: ui/evolution-event-editor.xml.h:35
-#, fuzzy
-msgid "FIXME: Insert File"
-msgstr "FIXME: Insereix el fitxer..."
+#~ msgid "Display options"
+#~ msgstr "Opcions de visualitzaciС"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: El_ement..."
+#~ msgid "Enable snoozing for"
+#~ msgstr "Habilita l'snoozing per a"
+
+#~ msgid "End of day:"
+#~ msgstr "Final del dia:"
+
+#~ msgid "First day of week:"
+#~ msgstr "primer dia de la setmana:"
+
+#~ msgid "Highlight"
+#~ msgstr "Ressalta"
+
+#~ msgid "Items Due Today"
+#~ msgstr "Elemts que vencen avui"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Elements que vencen avui:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elements que encara no han venГut"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elements que encara no han venГut:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "Elements venГuts"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Elements que ja han venГut:"
+
+#~ msgid "Pick a color"
+#~ msgstr "Agafa un color"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Recorda'm totes les cites"
+
+#~ msgid "Reminders"
+#~ msgstr "Recordatoris"
+
+#~ msgid "Show"
+#~ msgstr "Mostra"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Mostra els nЗmeros de les setmanes"
+
+#~ msgid "Start of day:"
+#~ msgstr "Inici del dia:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Temps fins al venciment"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Divisions de temps:"
+
+#~ msgid "Time format:"
+#~ msgstr "Format de l'hora:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuals"
+
+#~ msgid "Work week"
+#~ msgstr "Setmana de treball"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuts abans que es produeixin."
+
+#~ msgid "seconds."
+#~ msgstr "segons."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% comp_let:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassificaciС:"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Data completa:"
+
+#~ msgid "High"
+#~ msgstr "Alta"
+
+#~ msgid "In Progress"
+#~ msgstr "En procИs"
+
+#~ msgid "Low"
+#~ msgstr "Baixa"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Not Started"
+#~ msgstr "No iniciat"
+
+#~ msgid "Task"
+#~ msgstr "Tasca"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Contactes..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "_Data de venciment:"
+
+#~ msgid "_Priority:"
+#~ msgstr "_Prioritat:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Estat:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Esdeveniment per a _tot el dia"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Temes fonamentals sobre les cites"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "RecurrХncia personalitzada"
+
+#~ msgid "Days"
+#~ msgstr "Dies"
+
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgid "Exceptions"
+#~ msgstr "Excepcions"
+
+#~ msgid "Hours"
+#~ msgstr "Hores"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Envia per correu _a:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuts"
+
+#~ msgid "Modify"
+#~ msgstr "Modifica"
+
+#~ msgid "No recurrence"
+#~ msgstr "Sense recurrХncia"
 
-#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Enganxa e_special..."
+#~ msgid "Preview"
+#~ msgstr "PrevisualitzaciС:"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualitzaciС de la impressiС"
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blica el formulari com a..."
+#~ msgid "Pu_blic"
+#~ msgstr "PЗ_blic"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publica el _formulari..."
+#~ msgid "Recurrence"
+#~ msgstr "RecurrХncia"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Rec_urrХncia..."
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regla de recurrХncia"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: E_nvia"
+#~ msgid "Reminder"
+#~ msgstr "Recordatori"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "RecurrХncia simple"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Resu_m:"
+
+#~ msgid "Time"
+#~ msgstr "Temps"
+
+#~ msgid "_Audio"
+#~ msgstr "_юudio"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correu"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "_Run program:"
+#~ msgstr "_Executa el programa:"
+
+#~ msgid "_Start time:"
+#~ msgstr "Hora d'_inici:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data d'_inici:"
+
+#~ msgid "day(s)"
+#~ msgstr "dia(es)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "per a"
+
+#~ msgid "forever"
+#~ msgstr "per sempre"
+
+#~ msgid "label21"
+#~ msgstr "etiqueta21"
+
+#~ msgid "month(s)"
+#~ msgstr "mes(os)"
+
+#~ msgid "until"
+#~ msgstr "fins a"
+
+#~ msgid "week(s)"
+#~ msgstr "setmana(es)"
+
+#~ msgid "year(s)"
+#~ msgstr "any(s)"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: ui/evolution-event-editor.xml.h:43
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Invita els assistents..."
+#~ msgid "April"
+#~ msgstr "abril"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de seqЭХncies"
+#, fuzzy
+#~ msgid "August"
+#~ msgstr "agost"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _PeticiС de tasca"
+#, fuzzy
+#~ msgid "December"
+#~ msgstr "desembre"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacte"
+#, fuzzy
+#~ msgid "February"
+#~ msgstr "febrer"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalitza..."
+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "VИs a una data"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Fitxer..."
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "VИs a avui"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Lletra..."
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "gener"
 
-#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "FIXME: S'estЮ __formatant"
+#~ msgid "July"
+#~ msgstr "juliol"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Element"
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "juny"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada al _diari"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "marГ"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _зltim element de la carpeta"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Dilluns"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Missatge de _correu"
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "novembre"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estil _memo"
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "octubre"
 
-#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "_Mou a la carpeta"
+#~ msgid "September"
+#~ msgstr "setembre"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nova cita"
+#~ msgid "Attachment properties"
+#~ msgstr "Propietats de l'adjunciС"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#~ msgid "File name:"
+#~ msgstr "Nom del fitxer:"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objecte..."
+#~ msgid "MIME type:"
+#~ msgstr "Tipus de MIME:"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _ParЮgraf..."
+#~ msgid "Edit VFolders"
+#~ msgstr "Edita les VFolders"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
+#~ msgid "Filter Rules"
+#~ msgstr "Regles del filtre"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: E_stЮndard"
+#, fuzzy
+#~ msgid "Incoming"
+#~ msgstr ""
+#~ "Entrant\n"
+#~ "Sortint\n"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tasca"
+#, fuzzy
+#~ msgid "Outgoing"
+#~ msgstr "Contorn:"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Element per _llegir"
+#~ msgid "Virtual Folders"
+#~ msgstr "Carpetes virtuals"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "vFolder Sources"
+#~ msgstr "Fonts de la vFolder"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormat"
+#~ msgid "Save"
+#~ msgstr "Desa"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Mostra"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "Amaga"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "VИs a l'element segЭent"
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Suprimeix"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "VИs a l'element anterior"
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Assumpte"
 
-#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propietats de la llista de coses per fer"
+#~ msgid "Hide from Sender"
+#~ msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "SegЭent"
+#~ msgid "Hide Messages"
+#~ msgstr "Mou el missatge"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Enganxa"
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Assumpte"
 
-#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "Enganxa l'element del porta-retalls"
+#~ msgid "Current store format:"
+#~ msgstr "No s'ha pogut iniciar el wombat"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "Ant_erior"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "Ant_erior"
+#~ msgid "New store format:"
+#~ msgstr "Tipus de font de notМcies:"
 
-#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "Imprimeix..."
+#~ msgid "mh"
+#~ msgstr "h"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "No teniu configurada cap font de correu"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "ConfiguraciС de la pЮgina:"
+#~ msgid "Account Information"
+#~ msgstr "Cap informaciС"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "Propietats..."
+#~ msgid "Account Properties"
+#~ msgstr "Propietats de l'adjunciС"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "RЮdio"
+#~ msgid "Advanced"
+#~ msgstr "Afegeix..."
 
-#: ui/evolution-event-editor.xml.h:85
 #, fuzzy
-msgid "Redo the undone action"
-msgstr "Elimina una acciС"
+#~ msgid "Authentication"
+#~ msgstr "AutenticaciС:"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "Respon"
+#~ msgid "Authentication Type:"
+#~ msgstr "AutenticaciС:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "No suprimeixis els missatges del servidor"
 
-#: ui/evolution-event-editor.xml.h:91
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de diЮleg"
+#~ msgid "Done"
+#~ msgstr "Cap"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
-msgid "Save the current file"
-msgstr "l'hora actual"
+#~ msgid "E-Mail Address:"
+#~ msgstr "AdreГa electrРnica:"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "AdreГa electrРnica:"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraciС del correu"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "Nom complet:"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Nom d'usuari:"
 
-#: ui/evolution-event-editor.xml.h:97
 #, fuzzy
-msgid "Search for a string"
-msgstr "_Cerca contactes"
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#~ msgid "Identity"
+#~ msgstr "Identitat"
 
-#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "Selecciona'ls _tots"
+#~ msgid "Mail"
+#~ msgstr "_Correu"
 
-#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
-msgid "Select everything"
-msgstr "Seleccioneu una carpeta"
+#~ msgid "Mail Account"
+#~ msgstr "contИ"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraciС del correu"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "ConfiguraciС del correu"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "Nou"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
-msgid "_About..."
-msgstr "_Quant a l'Evolution..."
+#~ msgid "Optional"
+#~ msgstr "Opcions"
+
+#~ msgid "Organization:"
+#~ msgstr "OrganitzaciС:"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
-msgid "_Close"
-msgstr "Tanca"
+#~ msgid "Password:"
+#~ msgstr "Contrasenya"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "Copia"
+#~ msgid "Reply-to:"
+#~ msgstr "Respon"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Persones _requerides"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Edita"
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Desa com a VCard"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "Cerca..."
+#~ msgid "Select signature file"
+#~ msgstr "Fitxer de signatura:"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formularis"
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Ajuda"
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraciС del correu"
 
-#: ui/evolution-event-editor.xml.h:114
 #, fuzzy
-msgid "_Insert"
-msgstr "_мndex"
+#~ msgid "Server Type: "
+#~ msgstr "Servidor:"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objecte"
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Servidor:"
+
+#~ msgid "Signature file:"
+#~ msgstr "Fitxer de signatura:"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "Enganxa"
+#~ msgid "Signature:"
+#~ msgstr "Fitxer de signatura:"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Imprimeix"
+#~ msgid "Sources"
+#~ msgstr "Fonts"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "Propietats..."
+#~ msgid "Type"
+#~ msgstr "Tipus:"
 
-#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
-msgid "_Redo"
-msgstr "RЮdio"
+#~ msgid "User Information"
+#~ msgstr "Cap informaciС"
+
+#~ msgid "Username:"
+#~ msgstr "Nom d'usuari:"
 
-#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
-msgid "_Replace..."
-msgstr "_Tanca..."
+#~ msgid "minute(s)"
+#~ msgstr "minuts"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_Barres d'eines"
+#~ 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 ""
+#~ "IntroduОu el vostre nom i adreГa electrРnica que es farЮ servir al correu "
+#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra organitzaciС, "
+#~ "iel nom d'un fitxer d'on llegir la vostra signatura."
+
+#~ msgid "Full name:"
+#~ msgstr "Nom complet:"
+
+#~ msgid "Email address:"
+#~ msgstr "AdreГa electrРnica:"
+
+#~ msgid "Signature File"
+#~ msgstr "Fitxer de signatura"
+
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Detecta els tipus suportats..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "No suprimeixis els missatges del servidor"
+
+#~ msgid "Test Settings"
+#~ msgstr "ParЮmetres de prova"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Tipus de font del correu:"
+
+#~ 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 ""
+#~ "Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
+#~ "informaciС corresponent.\n"
+#~ "\n"
+#~ "Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
+#~ "tipus suportats...\" desprИs d'introduir l'altra informaciС."
+
+#~ msgid "News source type:"
+#~ msgstr "Tipus de font de notМcies:"
+
+#~ 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 ""
+#~ "Seleccioneu el tipus del vostre servidor de notМcies, i introduОu-ne la "
+#~ "informaciС corresponent.\n"
+#~ "Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
+#~ "tipus suportats...\" desprИs d'introduir l'altra informaciС."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Tipus de transport de correu:"
 
-#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
-msgid "_Undo"
-msgstr "_Envia"
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
+#~ "informaciС corresponent.\n"
+#~ "\n"
+#~ "Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
+#~ "tipus suportats...\" desprИs d'introduir l'altra informaciС."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Redacta"
+#~ msgid "Add Identity"
+#~ msgstr "Afegeix una identitat"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Edita la identitat"
+
+#~ msgid "Add Source"
+#~ msgstr "Afegeix una font"
+
+#~ msgid "Edit Source"
+#~ msgstr "Edita la font"
+
+#~ msgid "Add News Server"
+#~ msgstr "Afegeix un servidor de notМcies"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Edita el servidor de notМcies"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "S'estЮ comprovant \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "La connexiС ha tingut Хxit!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Possibilitats d'autoritzaciС de consultes de \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "AutoritzaciС de consultes a \"%s\""
+
+#~ msgid "Address"
+#~ msgstr "AdreГa"
+
+#~ msgid "Identities"
+#~ msgstr "Identitats"
+
+#~ msgid "Mail Sources"
+#~ msgstr "Fonts del correu"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Transport de correu"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Marca el missatge com a vist [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "Servidors de notМcies"
+
+#~ msgid "News Sources"
+#~ msgstr "Fonts de notМcies"
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Redacta un nou missatge"
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Copia el missatge a una nova carpeta"
+#~ msgid "Delete a contact"
+#~ msgstr "Suprimeix un contacte"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "C_arpeta"
+#~ msgid "Find"
+#~ msgstr "Cerca"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltre sobre el remitent"
+#~ msgid "Find a contact"
+#~ msgstr "Cerca un contacte"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtre sobre els dest_inataris"
+#~ msgid "Print contacts"
+#~ msgstr "Imprimeix els contactes"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Oblida les _contrasenyes"
+#~ msgid "Stop"
+#~ msgstr "Atura"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Recupera el correu"
+#~ msgid "Stop Loading"
+#~ msgstr "Atura la cЮrrega"
+
+#~ msgid "View All"
+#~ msgstr "Visualitza'ls tots"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Suprimeix el missatge"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "ConfiguraciС del _correu..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimeix els contactes..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Cerca contactes"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dies"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Modifica les preferХncies"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Missatge reenviat - %s"
+#~ msgid "Ca_lendar"
+#~ msgstr "Agenda"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "PreferХncies de l'agenda..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crea una nova cita"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea una nova agenda"
+
+#~ msgid "Day"
+#~ msgstr "Dia"
+
+#~ msgid "Go back in time"
+#~ msgstr "VИs enrera en el temps"
+
+#~ msgid "Go forward in time"
+#~ msgstr "VИs endavant en el temps"
+
+#~ msgid "Go to"
+#~ msgstr "VИs a"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "VИs a una data concreta"
+
+#~ msgid "Go to present time"
+#~ msgstr "VИs al present"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Next"
+#~ msgstr "SegЭent"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Obre una agenda"
+
+#~ msgid "Prev"
+#~ msgstr "Anterior"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Imprimeix el missatge seleccionat"
+#~ msgid "Save calendar as something else"
+#~ msgstr "Deixa l'agenda com a alguna altra cosa"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Mostra 1 dia"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Mostra 1 mes"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Mostra 1 setmana"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostra la setmana de treball"
+
+#~ msgid "Week"
+#~ msgstr "Setmana"
+
+#~ msgid "_New"
+#~ msgstr "_Nou"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Obre una agenda"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "_Filtres de correu ..."
+#~ msgid "_Save As..."
+#~ msgstr "Anomena i desa..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Suprimeix aquest element"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Gestiona les subscripcions..."
+#~ msgid "Delete..."
+#~ msgstr "Suprimeix"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "Mar_ca'l com a llegit"
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "_Ajuda"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Marca'l com a per _llegir"
+#, fuzzy
+#~ msgid "Print En_velope..."
+#~ msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Mou"
+#~ msgid "Print this item"
+#~ msgstr "Imprimeix aquest element"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Mou un missatge a una nova carpeta"
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Previsualitza el missatge que s'ha d'imprimir"
+#, fuzzy
+#~ msgid "Save _As..."
+#~ msgstr "Anomena i desa..."
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "PrevisualitzaciС d'impressiС del missatge..."
+#~ msgid "Save and Close"
+#~ msgstr "Desa i tanca"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Imprimeix el missatge a la impressora"
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Imprimeix el missatge..."
+#~ msgid "See online help"
+#~ msgstr "Consulta l'ajuda en lМnia"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Respon a _tots"
+#, fuzzy
+#~ msgid "Send _message to contact..."
+#~ msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Respon al _remitent"
+#~ msgid "_File"
+#~ msgstr "_Fitxer"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Selecciona'ls _tots"
+#, fuzzy
+#~ msgid "_Print..."
+#~ msgstr "Imprimeix..."
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
+#~ msgid "_Save"
+#~ msgstr "_Desa"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Mostra"
+#~ msgid "About..."
+#~ msgstr "Lletra..."
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Llista de missatges en cadena"
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "Agenda"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "VFolder sobre el remite_nt"
+#, fuzzy
+#~ msgid "C_ut"
+#~ msgstr "Personalitzat"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "VFolder sobre els destinata_ris"
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Agenda"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Clear the selection"
+#~ msgstr "_Inverteix la selecciС"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Aplica els filtres"
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Configura la carpeta"
+#~ msgid "Copy"
+#~ msgstr "Copia"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copia a la carpeta"
+#~ msgid "Cut"
+#~ msgstr "Personalitzat"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: _Llibreta d'adreces..."
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Edita el missatge"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Comp_rova els noms"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Esborra"
+#~ msgid "FIXME: Forward as v_Calendar"
+#~ msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "_Filtre sobre l'assumpte"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Ajuda"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Reenvia"
+#, fuzzy
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: _Tasca"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Inverteix la selecciС"
+#, fuzzy
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Insereix el fitxer..."
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "ConfiguraciС del _correu..."
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Rec_urrХncia..."
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Missatge"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Nova cita"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Mou a la carpeta"
+#~ msgid "Modify the file's properties"
+#~ msgstr "Propietats de la llista de coses per fer"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Obre'l en una nova finestra"
+#, fuzzy
+#~ msgid "N_ext"
+#~ msgstr "SegЭent"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Imprimeix el missatge"
+#~ msgid "Paste"
+#~ msgstr "Enganxa"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "_Anomena i desa..."
+#~ msgid "Paste the clipboard"
+#~ msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Font"
+#~ msgid "Previous"
+#~ msgstr "Ant_erior"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_En cadena"
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "Imprimeix..."
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "_Suprimeix"
+#~ msgid "Print Setup"
+#~ msgstr "ConfiguraciС de la pЮgina:"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_VFolder sobre l'assumpte"
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "Propietats..."
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de carpetes _virtuals..."
+#~ msgid "Redo"
+#~ msgstr "RЮdio"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Adjunta"
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Elimina una acciС"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "l'hora actual"
+#~ msgid "Replace"
+#~ msgstr "Respon"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Edita el missatge"
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#, fuzzy
+#~ msgid "Save the current file"
+#~ msgstr "l'hora actual"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Insereix un fitxer com a text dins del missatge"
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Cerca contactes"
 
-#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-msgid "Insert text file..."
-msgstr "_Insereix el fitxer de text... (FIXME)"
+#~ msgid "Select All"
+#~ msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Obre un fitxer"
+#~ msgid "Select everything"
+#~ msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "_Close"
+#~ msgstr "Tanca"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "_Anomena i desa"
+#~ msgid "_Copy"
+#~ msgstr "Copia"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edita"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Desa a la _carpeta..."
+#~ msgid "_Find..."
+#~ msgstr "Cerca..."
+
+#~ msgid "_Help"
+#~ msgstr "_Ajuda"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Desa a la _carpeta..."
+#~ msgid "_Paste"
+#~ msgstr "Enganxa"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
+#~ msgid "_Print"
+#~ msgstr "_Imprimeix"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Desa el missatge a una carpeta determinada"
+#, fuzzy
+#~ msgid "_Properties..."
+#~ msgstr "Propietats..."
 
-#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-msgid "Send"
-msgstr "_Envia"
+#~ msgid "_Redo"
+#~ msgstr "RЮdio"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "Remitent"
+#~ msgid "_Replace..."
+#~ msgstr "_Tanca..."
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "Remitent"
+#~ msgid "_Undo"
+#~ msgstr "_Envia"
+
+#~ msgid "Compose"
+#~ msgstr "Redacta"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Redacta un nou missatge"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia el missatge a una nova carpeta"
+
+#~ msgid "F_older"
+#~ msgstr "C_arpeta"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltre sobre el remitent"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtre sobre els dest_inataris"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Oblida les _contrasenyes"
+
+#~ msgid "Get Mail"
+#~ msgstr "Recupera el correu"
 
-#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-msgid "Send the mail in HTML format"
-msgstr "Envia els missatges en format HTML"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Suprimeix el missatge"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Envia aquest missatge"
+#~ msgid "Hide _Read messages"
+#~ msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Envia aquest missatge"
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Envia aquest missatge"
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtres de correu ..."
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Mostra/amaga les adjuncions"
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Gestiona les subscripcions..."
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Mostra les _adjuncions"
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_ca'l com a llegit"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marca'l com a per _llegir"
+
+#~ msgid "Move"
+#~ msgstr "Mou"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mou un missatge a una nova carpeta"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "PrevisualitzaciС d'impressiС del missatge..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimeix el missatge a la impressora"
+
+#~ msgid "Print message..."
+#~ msgstr "Imprimeix el missatge..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Respon a _tots"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Respon al _remitent"
+
+#~ msgid "Select _All"
+#~ msgstr "Selecciona'ls _tots"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "Mostra les _adjuncions"
+#~ msgid "Show _All messages"
+#~ msgstr "Mostra"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Llista de missatges en cadena"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VFolder sobre el remite_nt"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VFolder sobre els destinata_ris"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplica els filtres"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "S'estЮ enviant el missatge sense cap asuumpte"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copia a la carpeta"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Edita el missatge"
+
+#~ msgid "_Expunge"
+#~ msgstr "_Esborra"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insereix el fitxer de text... (FIXME)"
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtre sobre l'assumpte"
+
+#~ msgid "_Forward"
+#~ msgstr "_Reenvia"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverteix la selecciС"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "ConfiguraciС del _correu..."
+
+#~ msgid "_Message"
+#~ msgstr "_Missatge"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "_Obre..."
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Mou a la carpeta"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#~ msgid "_Open in New Window"
+#~ msgstr "_Obre'l en una nova finestra"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "Afegeix una carpeta a la llista de carpetes a quХ estic subscrit"
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimeix el missatge"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Refresca la llista"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "_Anomena i desa..."
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Refresca la llista de carpetes"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Font"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Elimina la carpeta de la llista de carpetes a quХ estic subscrit"
+#~ msgid "_Threaded"
+#~ msgstr "_En cadena"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Subscriu-me"
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "_Suprimeix"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Cancel╥la la subscripciС"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VFolder sobre l'assumpte"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Mostra una altra carpeta"
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "S_urt"
+#~ msgid "Attach"
+#~ msgstr "Adjunta"
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _dreceres de l'Evolution"
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "l'hora actual"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Surt del programa"
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Edita el missatge"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Per _comenГar"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Mostra informaciС referent a l'Evolution"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insereix un fitxer com a text dins del missatge"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Mostra la barra de _carpetes"
+#, fuzzy
+#~ msgid "Insert text file..."
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Mostra la barra de _dreceres"
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Obre un fitxer"
 
-#: ui/evolution.xml.h:14
 #, fuzzy
-msgid "Submit _Bug Report"
-msgstr "_Envia un informe d'error"
+#~ msgid "Save As"
+#~ msgstr "_Anomena i desa"
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Desa a la _carpeta..."
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Desa a la _carpeta..."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "UtilitzaciС del gestor de c_ontactes"
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "_Envia"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "UtilitzaciС de l'_agenda"
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Remitent"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "UtilitzaciС del _gestor de correu"
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Remitent"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Quant a l'Evolution..."
+#, fuzzy
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (FIXME)"
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Contacte (FIXME)"
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Carpeta"
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_VИs a la carpeta..."
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Mostra/amaga les adjuncions"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "_мndex"
+#~ msgid "Show _attachments"
+#~ msgstr "Mostra les _adjuncions"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "Missatge de _correu (FIXME)"
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "S'estЮ enviant el missatge sense cap asuumpte"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_ParЮmetres"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_Tasca (FIXME)"
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "_Obre..."
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Afegeix una carpeta a la llista de carpetes a quХ estic subscrit"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentatiu"
+#~ msgid "Refresh List"
+#~ msgstr "Refresca la llista"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupat"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Refresca la llista de carpetes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora de l'oficina"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Elimina la carpeta de la llista de carpetes a quХ estic subscrit"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Cap informaciС"
+#~ msgid "Subscribe"
+#~ msgstr "Subscriu-me"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invita a altres..."
+#~ msgid "Unsubscribe"
+#~ msgstr "Cancel╥la la subscripciС"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcions"
+#~ msgid "Display a different folder"
+#~ msgstr "Mostra una altra carpeta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostra _nomИs les hores de treball"
+#~ msgid "E_xit"
+#~ msgstr "S_urt"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Mostra-ho reduint el zoom"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _dreceres de l'Evolution"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Actualitza lliure/ocupat"
+#~ msgid "Exit the program"
+#~ msgstr "Surt del programa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Getting _Started"
+#~ msgstr "Per _comenГar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "Tria automЮtica"
+#~ msgid "Show information about Evolution"
+#~ msgstr "Mostra informaciС referent a l'Evolution"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostra la barra de _carpetes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Totes les persones i recursos"
+#, fuzzy
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Envia un informe d'error"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Totes les persones i un recurs"
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persones _requerides"
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persones requerides i _un recurs"
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora d'_inici de la reuniС:"
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "UtilitzaciС del gestor de c_ontactes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _finalitzaciС de la reuniС:"
+#~ msgid "Using the _Calendar"
+#~ msgstr "UtilitzaciС de l'_agenda"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tots els assistents"
+#~ msgid "Using the _Mailer"
+#~ msgstr "UtilitzaciС del _gestor de correu"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "DDDDDDD"
+#~ msgid "_About Evolution..."
+#~ msgstr "_Quant a l'Evolution..."
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (FIXME)"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Ara"
+#~ msgid "_Folder"
+#~ msgstr "_Carpeta"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "_Go to Folder..."
+#~ msgstr "_VИs a la carpeta..."
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "_Index"
+#~ msgstr "_мndex"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grup %i"
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "Missatge de _correu (FIXME)"
 
-#~ msgid "categories"
-#~ msgstr "categories"
+#~ msgid "_Settings"
+#~ msgstr "_ParЮmetres"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "El(s) element(s) pertanyen a aquestes categories:"
@@ -7657,9 +7256,6 @@ msgstr "Grup %i"
 #~ msgid "Preferences"
 #~ msgstr "PreferХncies"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmes"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Propietats de l'alarma"
 
@@ -7684,13 +7280,6 @@ msgstr "Grup %i"
 #~ msgid "Cannot get message: %s"
 #~ msgstr "No es pot recuperar el missatge: %s"
 
-#~ 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 "
@@ -7774,60 +7363,9 @@ msgstr "Grup %i"
 #~ 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"
-
-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "FIXME: Nou _contacte de la mateixa empresa"
-
-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "FIXME: Nova _carta per contactar"
-
-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "FIXME: Nova cit_a amb contacte"
-
-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "FIXME: _Prepara una cita..."
-
-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "FIXME: Nova _tasca per contactar"
-
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "FIXME: Nova entrada al _diari per contactar"
-
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Assenyala per al seguiment..."
-
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: _Mostra el mapa de l'adreГa"
-
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: _Obre la pЮgina web"
-
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "FIXME: Reenvia com a _vCard"
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Insereix un fitxer com a adjunciС"
 
-#~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Anterior"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "FIXME: SegЭent"
-
 #~ msgid "Gnome Calendar"
 #~ msgstr "Agenda del Gnome"
 
@@ -7960,15 +7498,6 @@ msgstr "Grup %i"
 #~ msgid "Currently pending operations:"
 #~ msgstr "Operacions encara pendents:"
 
-#~ msgid "To"
-#~ msgstr "Per a"
-
-#~ msgid "Size"
-#~ msgstr "Mida"
-
-#~ msgid "Show _shortcut bar"
-#~ msgstr "Mostra la barra de _dreceres"
-
 #~ msgid "Show _folder bar"
 #~ msgstr "Mostra la barra de _carpetes"
 
diff --git a/po/da.po b/po/da.po
index 118fe60839..ccf6b5ad53 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-01-17 00:19+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-16 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,26 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "TilfЬj tjeneste"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Opret en nyt brev"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nyt post"
-
 #: executive-summary/component/component-factory.c:152
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
@@ -47,8 +27,8 @@ msgstr "Kan ikke initialisere Evolutions oversigtskomponent for post."
 #: addressbook/conduit/address-conduit.c:1090
 #: addressbook/gui/component/addressbook-factory.c:38
 #: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1155
-#: calendar/conduits/todo/todo-conduit.c:970 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
@@ -180,18 +160,17 @@ msgstr ""
 msgid "Error"
 msgstr "Fejl"
 
-#: mail/mail-config.c:705
+#: mail/mail-config.c:799
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Test tilkobling til \"%s\""
 
-#: mail/mail-config.c:707
+#: mail/mail-config.c:801
 #, fuzzy
 msgid "Connect to server"
 msgstr "Kunne ikke koble til POP-tjener pЕ %s."
 
-#: notes/component-factory.c:27 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:14 ui/evolution-tasks.xml.h:3
+#: notes/component-factory.c:27
 msgid "New"
 msgstr "Ny"
 
@@ -210,594 +189,6 @@ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 msgid "Notes Component: Could not initialize bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikation"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "C_lear"
-msgstr "T_Ьm"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
-msgid "C_ut"
-msgstr "Klip _ud"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
-msgid "Clear"
-msgstr "TЬm"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
-msgid "Clear the selection"
-msgstr "TЬm det valgte"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8
-msgid "Close"
-msgstr "Luk"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
-msgid "Close the current file"
-msgstr "Luk aktiv fil"
-
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
-msgid "Copy"
-msgstr "KopiИr"
-
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
-msgid "Copy the selection"
-msgstr "KopiИr valget"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
-msgid "Cut"
-msgstr "Klip ud"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cut the selection"
-msgstr "Klip valget ud"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:381
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:673
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Delete"
-msgstr "Slet"
-
-#: ui/evolution-task-editor-dialog.xml.h:15
-#, fuzzy
-msgid "Delete this task"
-msgstr "Slet opgaven"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Dump XML"
-msgstr "Dump XML"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse af grФnsefladen som XML"
-
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "Adresse_bog..."
-
-#: ui/evolution-task-editor-dialog.xml.h:19
-#, fuzzy
-msgid "FIXME: Assig_n Task"
-msgstr "RET: _Opgave"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "RET: VФlg skema..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "RET: Tje_k navn"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "RET: KopiИr til mappe..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "RET: U_dform et skema..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "RET: DefinИr udskrifts-_stile"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "RET: _Udform dette skema"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "RET: FЬ_rste opfЬring i mappe"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
-msgstr "RET: _Videresend"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "RET: HjФlp"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "U_komplet opgave"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "IndsФt fil"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "Op_fЬring"
-
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
-msgstr "Opgavefo_respЬrgsel"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "IndsФt _speciel..."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "ForhЕndsvisning af udskrift"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "Pu_blicИr skema som..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "RET: PublicИr skema..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "RET: Gentagelse..."
-
-#: ui/evolution-task-editor-dialog.xml.h:38
-#, fuzzy
-msgid "FIXME: Reply to A_ll"
-msgstr "Svar til alle"
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "RET: _Send"
-
-#: ui/evolution-task-editor-dialog.xml.h:40
-#, fuzzy
-msgid "FIXME: S_end Status Report"
-msgstr "RET: _Send"
-
-#: ui/evolution-task-editor-dialog.xml.h:41
-#, fuzzy
-msgid "FIXME: S_kip Occurrence"
-msgstr "RET: Gentagelse..."
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "RET: Gem _bilag..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "RET: FejlsЬgning i skript"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "RET: Opgavefo_respЬrgsel"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "RET: _Ny aftale"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "RET: _Kontakt"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "RET: _Tilpas..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "RET: _Fil..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "RET: Skri_fttyper..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "RET: _Formatering"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "RET: _OpfЬring"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "RET: _JournalopfЬring"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "RET: _Sidste opfЬring i mappe"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "RET: Send _besked"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-#, fuzzy
-msgid "FIXME: _Mark Complete"
-msgstr "MarkИr som fuldfЬrt"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "RET: _Notits-stil"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "_Flyt til mappe..."
-
-#: ui/evolution-task-editor-dialog.xml.h:58
-#, fuzzy
-msgid "FIXME: _New Task"
-msgstr "RET: _Opgave"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "RET: _Objekt..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "RET: _Afsnit..."
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-#, fuzzy
-msgid "FIXME: _Reply"
-msgstr "RET: HjФlp"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "RET: _Stavekontrol..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "RET: _Standard"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "RET: _Opgave"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "RET: _UlФst opfЬring"
-
-#: ui/evolution-task-editor-dialog.xml.h:66
-#, fuzzy
-msgid "FIXME: _note"
-msgstr "RET: _Notits"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "RET: Hvad skal vФre her?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "Find"
-msgstr "Find"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "Find igen"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "Find ig_en"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
-msgid "Go to the next item"
-msgstr "GЕ til nФste opfЬring"
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
-msgid "Go to the previous item"
-msgstr "GЕ til forrige opfЬring"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
-msgid "Modify the file's properties"
-msgstr "фndr filens egenskaber"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
-msgid "N_ext"
-msgstr "N_Фste"
-
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
-msgid "Next"
-msgstr "NФste"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
-msgid "Paste"
-msgstr "IndsФt"
-
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
-msgid "Paste the clipboard"
-msgstr "IndsФt fra klippebordet"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
-msgid "Pre_vious"
-msgstr "Forri_ge"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
-msgid "Previous"
-msgstr "Forri_ge"
-
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
-msgid "Print S_etup..."
-msgstr "Skriverops_Фtning..."
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
-msgid "Print Setup"
-msgstr "SkriveropsФtning"
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "Print this item"
-msgstr "Udskriv denne ting"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "Print..."
-msgstr "Udskriv..."
-
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: ui/evolution-event-editor.xml.h:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "Genopret"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "Genopret fortrudt handling"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "Erstat"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "Erstat en streng"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
-msgid "Save"
-msgstr "Gem"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
-msgid "Save _As..."
-msgstr "_Gem som..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
-msgid "Save and Close"
-msgstr "Gem og luk"
-
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
-msgid "Save the current file"
-msgstr "Gem aktiv fil"
-
-#: ui/evolution-task-editor-dialog.xml.h:94
-#, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Gem kontakten og luk dialogboksen"
-
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "SЬg efter samme streng igen"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "SЬg efter en streng"
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
-msgid "See online help"
-msgstr "Se hjФlpetekster"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
-msgid "Select All"
-msgstr "VФlg alle"
-
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
-msgid "Select everything"
-msgstr "VФlg alt"
-
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
-msgid "Setup the page settings for your current printer"
-msgstr "RedigИr sideindstillinger for aktiv skriver"
-
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "Fortryd"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "Fortryd sidste handling"
-
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
-msgid "_About..."
-msgstr "_Om..."
-
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104
-msgid "_Close"
-msgstr "L_uk"
-
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
-msgid "_Copy"
-msgstr "_KopiИr"
-
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
-msgid "_Debug"
-msgstr "_FejlsЬg"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
-msgid "_Delete"
-msgstr "_Slet"
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:20
-msgid "_Edit"
-msgstr "_RedigИr"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:109 ui/evolution.xml.h:21
-msgid "_File"
-msgstr "_Fil"
-
-#: ui/evolution-event-editor.xml.h:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_Find..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "Sk_emaer"
-
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:24
-msgid "_Help"
-msgstr "_HjФlp"
-
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "_IndsФt"
-
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objekt"
-
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
-msgid "_Paste"
-msgstr "_IndsФt"
-
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Udskriv"
-
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
-msgid "_Properties..."
-msgstr "Egenska_ber..."
-
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "Genop_ret"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "E_rstat..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
-msgid "_Save"
-msgstr "_Gem"
-
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "VФrk_tЬjslinjer"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
-msgid "_Tools"
-msgstr "_VФrktЬj"
-
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_Fortryd"
-
-#: shell/e-storage-set-view.c:335 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:124 ui/evolution.xml.h:31
-msgid "_View"
-msgstr "_Vis"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "фndr opsФtning"
-
-#: ui/evolution-tasks.xml.h:2
-#, fuzzy
-msgid "Create a new task"
-msgstr "Opret en ny kontakt"
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Udskriv"
-
-#: ui/evolution-tasks.xml.h:5
-#, fuzzy
-msgid "Save task as something else"
-msgstr "Gem kalender som noget andet"
-
-#: ui/evolution-tasks.xml.h:6
-#, fuzzy
-msgid "Tasks Preferences..."
-msgstr "OpsФtning af kalender"
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Gem som..."
-
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kort: "
@@ -1212,14 +603,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indlФst\n"
 
 #: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:549
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-tjener"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:550
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -1228,10 +619,6 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lФse pilotens adresseapplikationsblok"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slet kontakt?"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1241,6 +628,11 @@ msgstr "Slet kontakt?"
 msgid "_Add"
 msgstr "_TilfЬj"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: ui/evolution-contact-editor.xml:37
+msgid "_Delete"
+msgstr "_Slet"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Telefontyper"
@@ -1251,9 +643,6 @@ msgid "New phone type"
 msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
 msgid "Add"
 msgstr "TilfЬj"
 
@@ -1311,8 +700,6 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -1329,7 +716,6 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
 msgid "General"
 msgstr "Generel"
 
@@ -1374,7 +760,6 @@ msgid "No_tes:"
 msgstr "_Notater:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1480,50 +865,6 @@ msgstr "SekundФr epost"
 msgid "Email 3"
 msgstr "TertiФr epost"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Canada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Tjek adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Land:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1592,7 +933,6 @@ msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabel"
 
@@ -1709,7 +1049,6 @@ msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config.glade.h:27
 msgid "Host:"
 msgstr "VФrt:"
 
@@ -1726,12 +1065,10 @@ msgid "Search Scope:"
 msgstr "SЬgeoprЕde:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config.glade.h:9
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config.glade.h:46
 msgid "Path:"
 msgstr "Sti:"
 
@@ -1756,168 +1093,27 @@ msgstr ""
 "den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:39
 msgid "Name:"
 msgstr "Navn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Kilder til adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:659
-#: mail/mail-config.glade.h:22
-msgid "Edit"
-msgstr "RedigИr"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Find..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Modtagerliste:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "VФlg mappe"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "VФlg navn fra:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "SЬg"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Navn"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:566
 msgid "Email"
 msgstr "Epost"
@@ -1984,174 +1180,6 @@ msgstr ""
 "\n"
 "Dobbelt-klik her for at oprette en ny kontakt."
 
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blanke skemaer ved slutningen:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Krop"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bund:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Skrifttype..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Bundtekst:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Toptekst"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Top-/bundtekst"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Overskrifter"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Toptekst for hvert bogstav"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "HЬjde:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Lige efter hinanden"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "InkludИr:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landskab"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Bogstavfaner pЕ siden"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marginer"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Antal kolonner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativer"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Side_opsФtning:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papirkilde:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "PortrФt"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Smugkig:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Udskriv med grЕtoner"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Modsat pЕ lige sider"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "HЬjre:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sektioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "SkyggelФgning"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "StЬrrelse:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start pЕ en ny side"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilnavn:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Top:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:67
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredde:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etiket26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalender-komponent"
@@ -2160,13 +1188,13 @@ msgstr "Evolution kalender-komponent"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "KonfigurationsvФrktЬj for evolutions kalenderkomponent.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:690
-#: calendar/conduits/todo/todo-conduit.c:505
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:792
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lФse pilotens kalenderapplikationsblok"
 
@@ -2178,8 +1206,8 @@ msgstr "Evolution opgaveliste-komponent"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "KonfigurationsvФrktЬj for evolutions opgavelistekomponent.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:604
-#: calendar/conduits/todo/todo-conduit.c:607
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lФse pilotens applikationsblok for opgaveliste"
 
@@ -2188,7 +1216,7 @@ msgstr "Kunne ikke lФse pilotens applikationsblok for opgaveliste"
 msgid "Reminder of your appointment at "
 msgstr "PЕmindelse om din aftale "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "UdsФt"
 
@@ -2198,19 +1226,19 @@ msgstr "UdsФt"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Fil ikke fundet"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "еbn kalender"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Gem kalender"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2218,7 +1246,7 @@ msgstr ""
 "OAF."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:328
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -2226,60 +1254,57 @@ msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:336 calendar/gui/calendar-model.c:765
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:370
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:373
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:376
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "ь"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:541
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Uigennemsigtig"
 
-#: calendar/gui/calendar-model.c:770
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2291,7 +1316,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -2299,27 +1324,27 @@ 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:889
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr " "
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:892
+#: calendar/gui/calendar-model.c:896
 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:896
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr " "
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1019
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2329,47 +1354,43 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1059
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentvФrdien skal vФre mellem 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1099
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten skal vФre mellem 0 og 9, inklusive"
 
-#: calendar/gui/calendar-summary.c:93
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A den %e. %B %Y"
 
-#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-summary.c:299
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Fejl ved indlФsning af kalender</b>"
 
-#: calendar/gui/calendar-summary.c:304
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>Fejl ved indlФsning af kalender</b>Kalenderen er i brug."
-
-#: calendar/gui/calendar-summary.c:310
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fejl ved indlФsning af kalender</b>Metode ikke understЬttet"
 
-#: calendar/gui/calendar-summary.c:476
+#: calendar/gui/calendar-summary.c:484
 msgid "Display"
 msgstr "Vis"
 
-#: calendar/gui/calendar-summary.c:481
+#: calendar/gui/calendar-summary.c:489
 msgid "Show appointments"
 msgstr "Vis aftaler"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:497
 msgid "Show tasks"
 msgstr "Vis opgaver"
 
-#: calendar/gui/calendar-summary.c:581
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "IndlФser kalender"
 
@@ -2377,570 +1398,229 @@ msgstr "IndlФser kalender"
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm pЕ %A %d %b %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Intet sammendrag."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "RedigИr aftale"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "UdsФt-tid (minutter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmer afbrydes efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip nЕr alarmvinduet kommer til syne."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "OpsФtning af kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Sammenpres weekender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis valgmuligheder"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:158
-msgid "Due Date"
-msgstr "FФrdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "SlЕ udsФttelse til for"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "Ugens fЬrste dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:438
-msgid "Friday"
-msgstr "fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "FremhФv:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Punkter som skal afsluttes idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Punkter som skal afsluttes idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Punkter som ikke skal afsluttes endnu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Punkter som ikke skal afsluttes endnu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "man"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:434
-msgid "Monday"
-msgstr "mandag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Overskredne opgaver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Overskredne opgaver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "VФlg en farve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:161
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "PЕmind mig om alle aftaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "PЕmindelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "lЬr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:439
-msgid "Saturday"
-msgstr "lЬrdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Vis sluttider for aftaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Vis ugenumre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagens starter:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "sЬn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:440
-msgid "Sunday"
-msgstr "sЬndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Opgaveblok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:437
-msgid "Thursday"
-msgstr "torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid til afslutning"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Tidsopdeling:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidsformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:435
-msgid "Tuesday"
-msgstr "tirsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:436
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbejdsuge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutter fЬr de skal ske."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "seconds."
-msgstr "sekunder."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker pЕ at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne aftale?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne opgave?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker pЕ at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne journalindgang?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% fФrdi_g:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-msgid "C_lassification:"
-msgstr "_Klassificering"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Cancelled"
-msgstr "Afbrudt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "FuldfЬrt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "FuldfЬrt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "HЬj"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Under udarbejdelse"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Lav"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-config.glade.h:41 shell/e-shell-view.c:1089
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "S_ummary"
-msgstr "_Sammendrag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Opgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Udefineret"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "_Due Date:"
-msgstr "Slut-_dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "RedigИr opgave"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "ьnsker du at gemme Фndringer?"
 
-#: calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-calendar-table.c:154
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:154
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:155
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:156
 msgid "Completion Date"
 msgstr "FФrdiggЬrelsesdato"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "End Date"
 msgstr "Slutdato"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "FФrdig-dato"
+
+#: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Precent complete"
 msgstr "Procent fФrdig"
 
 #: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.c:163
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "URL"
 msgstr "URI"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "еbn..."
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "еbn opgaven"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "MarkИr som fuldfЬrt"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "MarkИr opgaven som fuldfЬrt"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Slet"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Slet opgaven"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 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:1213
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1227
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1240
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
-#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
-#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Ny aftale..."
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "RedigИr denne aftale..."
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
-#: ui/evolution-event-editor.xml.h:15
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Slet denne aftale"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "GЬr denne aftale flytbar"
 
-#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Slet denne opfЬring"
 
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Slet alle opfЬringer"
 
-#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
-#: calendar/gui/e-tasks.c:608
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:162
+#: calendar/gui/e-tasks.c:146
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlФse opgaverne i '%s'"
 
-#: calendar/gui/e-tasks.c:345
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "Kunne ikke oprette en opgavefil i '%s'"
-
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden der krФves for at indlФse '%s' er ikke understЬttet"
@@ -2948,264 +1628,109 @@ msgstr "Metoden der krФves for at indlФse '%s' er ikke understЬttet"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %b"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "GrundlФggende om aftaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Egendefineret genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dage"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Undtagelser"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Timer"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Send _til:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutter"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "фndr"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Ingen genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "Smugkig"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "Of_fentlig"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Gentagelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regel for genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "PЕmindelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Simpel genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Lyd"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Fortrolig"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "_Kontakter"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lut-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_E-post"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "KЬ_r program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "for"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "RedigИr aftale"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "for evigt"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "pЕ"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etiket21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mЕned(er)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "mandag"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "til"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "tirsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "uge(r)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "onsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "Еr"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "torsdag"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "RedigИr aftale"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "fredag"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "pЕ"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "lЬrdag"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "sЬndag"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "hФndelser"
 
-#: calendar/gui/event-editor.c:838
+#: 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:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/gnome-cal.c:709
-#, c-format
-msgid "Could not load the folder in `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
 msgstr "Kinne ikke indlФse mappen i '%s'"
 
-#: calendar/gui/gnome-cal.c:720
-#, c-format
-msgid "Could not create a folder in `%s'"
-msgstr "Kinne ikke oprette en mappe i '%s'"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "april"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "august"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "GЕ til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "GЕ til i dag"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "januar"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "Metoden der krФves for at indlФse '%s' er ikke understЬttet"
 
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "juli"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "sЬn"
 
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "juni"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "man"
 
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "marts"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "tir"
 
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "maj"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "ons"
 
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "november"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "tor"
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "fre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "september"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "lЬr"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -3399,7 +1924,7 @@ msgstr "Dette Еr (%Y)"
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "ForhЕndsvisning af udskrift"
 
@@ -3507,22 +2032,22 @@ msgstr "%s-tjener %s"
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s pЕ %s"
 
-#: camel/camel-remote-store.c:317
+#: camel/camel-remote-store.c:318
 msgid "Connection cancelled"
 msgstr "Forbindelse annuleret"
 
-#: camel/camel-remote-store.c:320 camel/camel-remote-store.c:333
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(ukendt vФrt)"
 
-#: camel/camel-remote-store.c:425 camel/camel-remote-store.c:487
-#: camel/camel-remote-store.c:555
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Handling annuleret"
@@ -3552,12 +2077,12 @@ msgstr "Ingen vФrt %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Midlertidig ude af stand til at slЕ vФrtsnavn %s op."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgФngelig for protokol `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3622,12 +2147,13 @@ msgstr "Svar fra IMAP-tjener indeholdt ikke %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlФse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:627
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
@@ -4143,7 +2669,6 @@ msgid "No such folder `%s'."
 msgstr "Ingen sЕdan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:56
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4217,7 +2742,7 @@ msgstr ""
 "SMTP-servere."
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295 mail/mail-config.glade.h:10
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -4358,12 +2883,11 @@ msgid "attachment"
 msgstr "bilag"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "VedhФft en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Fjern"
 
@@ -4379,18 +2903,6 @@ msgstr "VedhФft bilag..."
 msgid "Attach a file to the message"
 msgstr "VedhФft bilag til meddelelsen"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-msgid "Attachment properties"
-msgstr "Egenskaber for bilag"
-
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
-
 #: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
 #: mail/mail-format.c:624
 msgid "From:"
@@ -4530,7 +3042,7 @@ msgstr "Skriv en meddelelse"
 msgid "Could not create composer window."
 msgstr "Kan ikke oprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:345
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
@@ -4666,7 +3178,7 @@ msgstr "indkommende"
 msgid "outgoing"
 msgstr "udgЕende"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "RedigИr filtre"
 
@@ -4767,30 +3279,6 @@ msgstr "Vigtig"
 msgid "Read"
 msgstr "LФst"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "RedigИr VMapper"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Indkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "UdgЕende"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Visuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "VMappe-kilder"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -4977,11 +3465,11 @@ msgstr "TilfЬj regel for VMapper"
 msgid "Edit VFolder Rule"
 msgstr "RedigИr VMappe-regel"
 
-#: mail/component-factory.c:282
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:318
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
@@ -5037,27 +3525,35 @@ msgstr "FiltrИr efter modtager"
 msgid "Filter on Mailing List"
 msgstr "FiltrИr efter epostliste"
 
-#: mail/folder-browser.c:658 ui/evolution-message-composer.xml.h:10
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "еbn"
 
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "RedigИr"
+
 #: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Gem som..."
 
+#: mail/folder-browser.c:661 mail/mail-view.c:148
+msgid "Print"
+msgstr "Udskriv"
+
 #: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Svar til afsender"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:666 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Videresend mellem linjerne"
 
@@ -5096,44 +3592,33 @@ msgstr "Skab regel fra besked"
 msgid "Filter on Mailing List (%s)"
 msgstr "FiltrИr efter epostliste (%s)"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "NuvФrende gemningsformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Postkasseformat"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nyt gemningsformat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Forvalg"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:341
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Evolution kontobehandler"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:605
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
@@ -5157,7 +3642,7 @@ msgstr "Epost fra %s"
 msgid "%s mailing list"
 msgstr "%s diskussionsliste"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5169,7 +3654,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5177,7 +3662,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "fЬr du kan sende epost."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5185,15 +3670,15 @@ msgstr ""
 "Du skal konfigurere en epost-transport\n"
 "fЬr du kan sende epost."
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Du har ikke konfigureret en udboks"
 
-#: mail/mail-callbacks.c:258
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5201,27 +3686,27 @@ msgstr ""
 "Denne meddelse har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:345
 msgid "You must configure an account before you can send this email."
 msgstr "Du skal konfigurere en konto fЬr du kan sende dette brev."
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:365
 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:567
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-callbacks.c:648
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "KopiИr meddelelse(r) til"
 
-#: mail/mail-callbacks.c:785
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5229,11 +3714,11 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:818 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:822 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5241,15 +3726,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:867
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:869
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:953
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5258,249 +3743,22 @@ msgstr ""
 "Fejl ved indlФsning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1002
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1049
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "kontoinformation"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Kontoadministration"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaber for konto"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringtype:"
-
-#: mail/mail-config.glade.h:11
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Din epost-konfiguration er nu komplet.\n"
-"Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
-
-#: mail/mail-config.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:18
-msgid "Default"
-msgstr "Forvalg"
-
-#: mail/mail-config.glade.h:20
-msgid "Done"
-msgstr "Gjort"
-
-#: mail/mail-config.glade.h:21
-msgid "E-Mail Address:"
-msgstr "E-postadresse:"
-
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Epostadresse:"
-
-#: mail/mail-config.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Konfiguration af Evolution epost"
-
-#: mail/mail-config.glade.h:25
-msgid "Full Name:"
-msgstr "Fulde navn:"
-
-#: mail/mail-config.glade.h:28
-msgid "Hostname:"
-msgstr "VФrtsnavn:"
-
-#: mail/mail-config.glade.h:29
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "Server for indkommende post"
-
-#: mail/mail-config.glade.h:31
-msgid "Keep mail on server"
-msgstr "Behold post pЕ server"
-
-#: mail/mail-config.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:33
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:34
-msgid "Mail Account"
-msgstr "Epostkonto"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail Configuration"
-msgstr "Konfiguration af epost"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "Konfigurationguide for epost"
-
-#: mail/mail-config.glade.h:37
-msgid "Make this my default account"
-msgstr "GЬr dette til min standardkonto"
-
-#: mail/mail-config.glade.h:38
-msgid "Miscellaneous"
-msgstr "Forskelligt"
-
-#: mail/mail-config.glade.h:40
-msgid "News"
-msgstr "Nyheder"
-
-#: mail/mail-config.glade.h:42
-msgid "Optional"
-msgstr "Alternativ"
-
-#: mail/mail-config.glade.h:43
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:44
-msgid "Outgoing Mail Server"
-msgstr "Server for udgЕende post"
-
-#: mail/mail-config.glade.h:45
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: mail/mail-config.glade.h:47
-msgid "Plain Text"
-msgstr "Almindelig tekst"
-
-#: mail/mail-config.glade.h:48
-msgid "Receiving Email"
-msgstr "Modtager post"
-
-#: mail/mail-config.glade.h:49
-msgid "Remember my password"
-msgstr "Husk min adgangskode"
-
-#: mail/mail-config.glade.h:50 mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#: mail/mail-config.glade.h:51
-msgid "Required"
-msgstr "NЬdvendigt"
-
-#: mail/mail-config.glade.h:52
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config.glade.h:53
-msgid "Save password"
-msgstr "Gem adgangskode"
-
-#: mail/mail-config.glade.h:54
-msgid "Select signature file"
-msgstr "VФlg signaturfil"
-
-#: mail/mail-config.glade.h:55
-msgid "Sending Email"
-msgstr "Sender post"
-
-#: mail/mail-config.glade.h:57
-msgid "Server Configuration"
-msgstr "Konfiguration af server"
-
-#: mail/mail-config.glade.h:58
-msgid "Server Type: "
-msgstr "Tjenertype:"
-
-#: mail/mail-config.glade.h:59
-msgid "Server requires authentication"
-msgstr "Server krФver autentificering"
-
-#: mail/mail-config.glade.h:60
-msgid "Servers"
-msgstr "Servere"
-
-#: mail/mail-config.glade.h:61
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:62
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:63
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.glade.h:64
-msgid "This server requires a secure connection (SSL)"
-msgstr "Denne server krЬver en sikker forbindelse (SSL)"
-
-#: mail/mail-config.glade.h:65
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:66
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Indtast navnet som du Ьnsker at bruge for disse servere. For eksempel: 'job' "
-"eller 'hjemme'."
-
-#: mail/mail-config.glade.h:68
-msgid "User Information"
-msgstr "Brugerinformation"
-
-#: mail/mail-config.glade.h:69
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: mail/mail-config.glade.h:70
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-
-#: mail/mail-config-druid.c:346
+#: mail/mail-config-druid.c:363
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
 "You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:612
+#: mail/mail-config-druid.c:629
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5508,7 +3766,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:889
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr ""
 
@@ -5566,6 +3824,10 @@ msgstr "Skjul"
 msgid "%s attachment"
 msgstr "%s-bilag"
 
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
 #: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
@@ -5689,143 +3951,143 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter breve fra %s"
 
-#: mail/mail-ops.c:92
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent breve fra %s"
 
-#: mail/mail-ops.c:342
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen nye breve pЕ %s."
 
-#: mail/mail-ops.c:413
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Fi_ltrerer breve pЕ anmodning"
 
-#: mail/mail-ops.c:415
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fi_ltrИr breve pЕ anmodning"
 
-#: mail/mail-ops.c:546
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender '%s'"
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Sender meddelelse"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Sender kЬ"
 
-#: mail/mail-ops.c:666
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Send kЬ"
 
-#: mail/mail-ops.c:801 mail/mail-ops.c:808
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "TilfЬjer \"%s\""
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:811
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "TilfЬjer en besked uden emne"
 
-#: mail/mail-ops.c:894
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meddelelser fra '%s' til '%s'"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meddelelser fra '%s' til '%s'"
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flyt meddelelser fra '%s' til '%s'"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "KopiИr meddelelser fra '%s' til '%s'"
 
-#: mail/mail-ops.c:932
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "KopiИrer"
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s besked %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1030
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1096 mail/subscribe-dialog.c:347
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1161
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1202 mail/mail-ops.c:1271
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "еbner mappe %s"
 
-#: mail/mail-ops.c:1333
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1383
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "TЬmmer mappe %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter besked nummer %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "IndlФser %s mappe for %s"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "IndlФs %s mappe for %s"
 
-#: mail/mail-ops.c:1825
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1904
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5834,12 +4096,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gemmer besked %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1931
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5962,27 +4224,27 @@ msgstr "Ny VMappe"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Svar til afsenderen af denne meddelelse"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle modtagere af denne meddelelse"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Videresend denne meddelelse"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Udskriv den valgte meddelelse"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Slet denne meddelelse"
 
@@ -6067,12 +4329,12 @@ msgstr ""
 
 #: mail/openpgp-utils.c:78
 #, fuzzy, c-format
-msgid "Please entry your %s passphrase for %s"
+msgid "Please enter your %s passphrase for %s"
 msgstr "Venligst indtast NNTP-adgangskode for %s@%s"
 
 #: mail/openpgp-utils.c:81
 #, fuzzy, c-format
-msgid "Please entry your %s passphrase"
+msgid "Please enter your %s passphrase"
 msgstr "Venligst indtast NNTP-adgangskode for %s@%s"
 
 #: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
@@ -6285,9 +4547,14 @@ msgstr "(Ingen mappe vist)"
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1093
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -6381,7 +4648,11 @@ msgstr "Fjern denne genvej fra genvejsbjФlken"
 msgid "Error saving shortcuts."
 msgstr "Fejl under gemning af genveje."
 
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
+msgid "_View"
+msgstr "_Vis"
+
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
@@ -6492,778 +4763,1936 @@ msgstr "Deaktiveret."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create a new contact"
-msgstr "Opret en ny kontakt"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "RET: _Ny 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 "RET: Send _besked"
+
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "RET: _Kontakt"
+
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "RET: _Opgave"
+
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "RET: Opgavefo_respЬrgsel"
+
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "RET: _JournalopfЬring"
+
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "RET: _Notits"
+
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "RET: VФlg skema..."
+
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "RET: _Notits-stil"
+
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "RET: DefinИr udskrifts-_stile"
+
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "RET: _Send"
+
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "RET: 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 "RET: KopiИr til mappe..."
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+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
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "IndsФt _speciel..."
+
+#: 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 "RET: _OpfЬring"
+
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "RET: _UlФst opfЬring"
+
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "RET: FЬ_rste opfЬring i mappe"
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "RET: _Sidste opfЬring i mappe"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slet en kontakt"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "RET: _Standard"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Find kontakt"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "RET: _Formatering"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Udskriv kontakt"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "RET: _Tilpas..."
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stop"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Forri_ge"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stop indlФsning"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "NФste"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Vis alle"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "VФrk_tЬjslinjer"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "RET: _Fil..."
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfiguration af _adressebog..."
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "Op_fЬring"
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "RET: _Objekt..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "RET: Skri_fttyper..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Udskriv kontakter..."
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "RET: _Afsnit..."
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_SЬg efter kontakter"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "RET: _Udform dette skema"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "Fem dage"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "RET: U_dform et skema..."
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "_Kalender"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "RET: PublicИr skema..."
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "OpsФtning af kalender"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "Pu_blicИr skema som..."
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
-msgstr "Opret en ny aftale"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "RET: FejlsЬgning i skript"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Opret en ny kalender"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "RET: _Stavekontrol..."
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "Sk_emaer"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Go back in time"
-msgstr "GЕ tilbage i tiden"
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "_Ny kontaktperson"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go forward in time"
-msgstr "GЕ fremad i tid"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "Ny _Kontaktperson fra samme organisation"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "GЕ til"
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "Nyt _brev til kontaktperson"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to a specific date"
-msgstr "GЕ til specifik dato"
+#: ui/evolution-contact-editor.xml:146
+msgid "FIXME: New _Message to Contact"
+msgstr "Nyt _brev til kontaktperson"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to present time"
-msgstr "GЕ til nutiden"
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "Nyt _mЬde med kontakt"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "MЕned"
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_PlanlФg et mЬde..."
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "еbn en kalender"
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "_Ny _Opgave for kontakt"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Smugkig"
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "Ny _journalopfЬring for kontakt"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
-msgstr "Udskriv denne kalender"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "_Flag for opfЬlgning..."
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Gem kalender som noget andet"
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "_Vis sammenhФng mellem adresser"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Show 1 day"
-msgstr "Vis Иn dag"
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "_еbn netside"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show 1 month"
-msgstr "Vis Иn mЕned"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "RET: Videresend som _vCalendar"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show 1 week"
-msgstr "Vis Иn uge"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "RET: _Videresend"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show the working week"
-msgstr "Vis arbejdsugen"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_IndsФt"
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: ui/evolution-contact-editor.xml:171
+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"
+
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A den %d. %B %Y"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Optaget"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Ude"
+
+#: 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..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Alternativer"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Vis k_un arbejdstid"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Vis _zoomet ud"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Opdater fri/optaget"
+
+#: 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 "_AutovФlg"
+
+#: 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 "_Alle mennesker og resurser"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle _mennesker og en resurse"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_NЬdvendige mennesker"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "NЬdvendige mennesker _og en resurse"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Tid for mЬdets _start:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Tid for mЬdets slutning:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle deltagere"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "mtotfls"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "nu"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "I dag"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Uge"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:28
-msgid "_New"
-msgstr "_Ny"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr " "
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_еbn kalender"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "_SЬg..."
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "_Udskriv denne kalender"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Slet dette punkt"
+#~ msgid "Add Service"
+#~ msgstr "TilfЬj tjeneste"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Slet..."
+#~ msgid "Create a new email"
+#~ msgstr "Opret en nyt brev"
 
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "HjФlp"
+#~ msgid "New Mail"
+#~ msgstr "Nyt post"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv kuvert..."
+#~ msgid "About this application"
+#~ msgstr "Om denne applikation"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Gem kontakten og luk dialogboksen"
+#~ msgid "About..."
+#~ msgstr "Om..."
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Send _kontaktperson til andre..."
+#~ msgid "C_lear"
+#~ msgstr "T_Ьm"
 
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Ny _meddelelse til kontaktperson"
+#~ msgid "C_ut"
+#~ msgstr "Klip _ud"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Udskriv..."
+#~ msgid "Clear"
+#~ msgstr "TЬm"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Luk denne aftale"
+#~ msgid "Clear the selection"
+#~ msgstr "TЬm det valgte"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "RET: Videresend som _vCalendar"
+#~ msgid "Close"
+#~ msgstr "Luk"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "RET: _Ny aftale"
+#~ msgid "Close the current file"
+#~ msgstr "Luk aktiv fil"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "RET: _Notits"
+#~ msgid "Copy"
+#~ msgstr "KopiИr"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Gem aftalen og luk dialogboksen"
+#~ msgid "Copy the selection"
+#~ msgstr "KopiИr valget"
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
-msgstr "PlanlФg mЬde"
+#~ msgid "Cut"
+#~ msgstr "Klip ud"
 
-#: ui/evolution-event-editor.xml.h:89
-msgid "Schedule _Meeting"
-msgstr "_PlanlФg mЬde"
+#~ msgid "Cut the selection"
+#~ msgstr "Klip valget ud"
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "OpsФt et eller andet mЬde"
+#, fuzzy
+#~ msgid "Delete this task"
+#~ msgstr "Slet opgaven"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Skriv"
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Skriv en ny meddelelse"
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump beskrivelse af grФnsefladen som XML"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "KopiИr meddelelse til en ny mappe"
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "Adresse_bog..."
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr ""
+#, fuzzy
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "RET: _Opgave"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Mapper"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "RET: Tje_k navn"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "FiltrИr _efter afsender"
+#~ msgid "FIXME: Help"
+#~ msgstr "RET: HjФlp"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "FiltrИr efter mod_tager"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "U_komplet opgave"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Glem _adgangskoder"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "IndsФt fil"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent post"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "RET: Gentagelse..."
 
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr ""
+#, fuzzy
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "Svar til alle"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr ""
+#, fuzzy
+#~ msgid "FIXME: S_end Status Report"
+#~ msgstr "RET: _Send"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul _lФste beskeder"
+#, fuzzy
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "RET: Gentagelse..."
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Brev_filtre..."
+#, fuzzy
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "MarkИr som fuldfЬrt"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Behandl abonnementer..."
+#, fuzzy
+#~ msgid "FIXME: _New Task"
+#~ msgstr "RET: _Opgave"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "MФrk som _lФst"
+#, fuzzy
+#~ msgid "FIXME: _Reply"
+#~ msgstr "RET: HjФlp"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "MФrk som _ulФst"
+#, fuzzy
+#~ msgid "FIXME: _note"
+#~ msgstr "RET: _Notits"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flyt"
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "RET: Hvad skal vФre her?"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flyt meddelelsen til en ny mappe"
+#~ msgid "Find"
+#~ msgstr "Find"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
+#~ msgid "Find Again"
+#~ msgstr "Find igen"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vis udskrift af besked..."
+#~ msgid "Find _Again"
+#~ msgstr "Find ig_en"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Udskriv besked til printeren"
+#~ msgid "Modify the file's properties"
+#~ msgstr "фndr filens egenskaber"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Udskriv besked..."
+#~ msgid "N_ext"
+#~ msgstr "N_Фste"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+#~ msgid "Paste"
+#~ msgstr "IndsФt"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svar til _afsender"
+#~ msgid "Paste the clipboard"
+#~ msgstr "IndsФt fra klippebordet"
 
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr ""
+#~ msgid "Previous"
+#~ msgstr "Forri_ge"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "VФlg _alle"
+#~ msgid "Print S_etup..."
+#~ msgstr "Skriverops_Фtning..."
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Afsend kЬet post og modtag ny post"
+#~ msgid "Print Setup"
+#~ msgstr "SkriveropsФtning"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr ""
+#~ msgid "Print this item"
+#~ msgstr "Udskriv denne ting"
+
+#~ msgid "Print..."
+#~ msgstr "Udskriv..."
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaber"
+
+#~ msgid "Redo"
+#~ msgstr "Genopret"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Genopret fortrudt handling"
+
+#~ msgid "Replace"
+#~ msgstr "Erstat"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "TrЕdet meddelelsesliste"
+#~ msgid "Replace a string"
+#~ msgstr "Erstat en streng"
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "VMappe for _afsender"
+#~ msgid "Save"
+#~ msgstr "Gem"
 
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "VMappe for _modtagere"
+#~ msgid "Save _As..."
+#~ msgstr "_Gem som..."
 
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Vis rЕ beskedskildetekst"
+#~ msgid "Save and Close"
+#~ msgstr "Gem og luk"
 
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "_Anvend filtre"
+#~ msgid "Save the current file"
+#~ msgstr "Gem aktiv fil"
 
-#: ui/evolution-mail.xml.h:47
 #, fuzzy
-msgid "_Configure Folder..."
-msgstr "_KonfigurИr mappe..."
+#~ msgid "Save the task and close the dialog box"
+#~ msgstr "Gem kontakten og luk dialogboksen"
 
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_KopiИr til mappe..."
+#~ msgid "Search again for the same string"
+#~ msgstr "SЬg efter samme streng igen"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_RedigИr besked"
+#~ msgid "Search for a string"
+#~ msgstr "SЬg efter en streng"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_TЬm skrФldespand"
+#~ msgid "See online help"
+#~ msgstr "Se hjФlpetekster"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_FiltrИr efter emne"
+#~ msgid "Select All"
+#~ msgstr "VФlg alle"
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Videresend"
+#~ msgid "Select everything"
+#~ msgstr "VФlg alt"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_versИr udvalg"
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "RedigИr sideindstillinger for aktiv skriver"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Konfiguration af epost..."
+#~ msgid "Undo"
+#~ msgstr "Fortryd"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Besked"
+#~ msgid "Undo the last action"
+#~ msgstr "Fortryd sidste handling"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Flyt til mappe..."
+#~ msgid "_About..."
+#~ msgstr "_Om..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_еbn i nyt vindue"
+#~ msgid "_Close"
+#~ msgstr "L_uk"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Udskriv besked"
+#~ msgid "_Copy"
+#~ msgstr "_KopiИr"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Gem besked som..."
+#~ msgid "_Debug"
+#~ msgstr "_FejlsЬg"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_TrЕdet"
+#~ msgid "_Edit"
+#~ msgstr "_RedigИr"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_Fortryd sletning"
+#~ msgid "_File"
+#~ msgstr "_Fil"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMappe for emne"
+#~ msgid "_Find..."
+#~ msgstr "_Find..."
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering af _virtuelle mapper..."
+#~ msgid "_Help"
+#~ msgstr "_HjФlp"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "VedhФft"
+#~ msgid "_Paste"
+#~ msgstr "_IndsФt"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "KryptИr denne besked med PGP"
+#~ msgid "_Print"
+#~ msgstr "_Udskriv"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "_Properties..."
+#~ msgstr "Egenska_ber..."
 
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "IndsФt en fil som tekst i meddelelsen"
+#~ msgid "_Redo"
+#~ msgstr "Genop_ret"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "IndsФt tekstfil..."
+#~ msgid "_Replace..."
+#~ msgstr "E_rstat..."
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "еbn en fil"
+#~ msgid "_Save"
+#~ msgstr "_Gem"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP-kryptering"
+#~ msgid "_Undo"
+#~ msgstr "_Fortryd"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP-underskrift"
+#~ msgid "Alter preferences"
+#~ msgstr "фndr opsФtning"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gem som"
+#, fuzzy
+#~ msgid "Create a new task"
+#~ msgstr "Opret en ny kontakt"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr ""
+#, fuzzy
+#~ msgid "Save task as something else"
+#~ msgstr "Gem kalender som noget andet"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gem i _mappe..."
+#, fuzzy
+#~ msgid "Tasks Preferences..."
+#~ msgstr "OpsФtning af kalender"
 
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Gem i mappe..."
+#~ msgid "_Save As..."
+#~ msgstr "_Gem som..."
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Gem den aktive fil med et andet navn"
+#~ msgid "Delete Contact?"
+#~ msgstr "Slet kontakt?"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Gem meddelelsen i en angivet mappe"
+#~ msgid "Address _2:"
+#~ msgstr "Adresse _2:"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Send"
+#~ msgid "Canada"
+#~ msgstr "Canada"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Send _senere"
+#~ msgid "Check Address"
+#~ msgstr "Tjek adresse"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Send se_nere"
+#~ msgid "Countr_y:"
+#~ msgstr "_Land:"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Send meddelser i HTML-format"
+#~ msgid "Finland"
+#~ msgstr "Finland"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Send beskeden senere"
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send meddelelsen nu"
+#~ msgid "_Address:"
+#~ msgstr "_Adresse:"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Send denne meddelelse nu"
+#~ msgid "_City:"
+#~ msgstr "_By:"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Vis/skjul bilag"
+#~ msgid "_PO Box:"
+#~ msgstr "_Postboks:"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Vis _bilag"
+#~ msgid "_State/Province:"
+#~ msgstr "_Stat/Provins:"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Vis bilag"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_ZIP/Postnummer:"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Underskriver denne besked med din PGP-nЬgle"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Kilder til adressebog"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_IndsФt tekstfil..."
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_еbn..."
+#~ msgid "Find..."
+#~ msgstr "Find..."
 
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_Sikkerhed"
+#~ msgid "Message Recipients"
+#~ msgstr "Modtagerliste:"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "TilfЬj mappe pЕ listen over abonnerede mapper"
+#~ msgid "Select Names"
+#~ msgstr "VФlg mappe"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "LФs listen igen"
+#~ msgid "Select name from:"
+#~ msgstr "VФlg navn fra:"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "LФs mappelisten igen"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abonnerede mapper"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "AbonnИr"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution.xml.h:1
-msgid "Display a different folder"
-msgstr "Vis en anden mappe"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution.xml.h:2
-msgid "E_xit"
-msgstr "_Afslut"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution.xml.h:3
-msgid "Evolution bar _shortcut"
-msgstr "Evolution bjФlke_genvej"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution.xml.h:4
-msgid "Exit the program"
-msgstr "Afslut programmet"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution.xml.h:5
-msgid "Getting _Started"
-msgstr "Kom _igang"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution.xml.h:6
-msgid "Import an external file format"
-msgstr ""
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Blanke skemaer ved slutningen:"
+
+#~ msgid "Body"
+#~ msgstr "Krop"
+
+#~ msgid "Bottom:"
+#~ msgstr "Bund:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensioner:"
+
+#~ msgid "Font..."
+#~ msgstr "Skrifttype..."
+
+#~ msgid "Fonts"
+#~ msgstr "Skrifttyper"
+
+#~ msgid "Footer:"
+#~ msgstr "Bundtekst:"
+
+#~ msgid "Format"
+#~ msgstr "Format"
+
+#~ msgid "Header"
+#~ msgstr "Toptekst"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Top-/bundtekst"
+
+#~ msgid "Headings"
+#~ msgstr "Overskrifter"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Toptekst for hvert bogstav"
+
+#~ msgid "Height:"
+#~ msgstr "HЬjde:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Lige efter hinanden"
+
+#~ msgid "Include:"
+#~ msgstr "InkludИr:"
+
+#~ msgid "Landscape"
+#~ msgstr "Landskab"
+
+#~ msgid "Left:"
+#~ msgstr "Venstre:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Bogstavfaner pЕ siden"
+
+#~ msgid "Margins"
+#~ msgstr "Marginer"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Antal kolonner:"
+
+#~ msgid "Options"
+#~ msgstr "Alternativer"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
+
+#~ msgid "Page"
+#~ msgstr "Side"
+
+#~ msgid "Paper"
+#~ msgstr "Papir"
+
+#~ msgid "Paper source:"
+#~ msgstr "Papirkilde:"
+
+#~ msgid "Portrait"
+#~ msgstr "PortrФt"
+
+#~ msgid "Preview:"
+#~ msgstr "Smugkig:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Udskriv med grЕtoner"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Modsat pЕ lige sider"
+
+#~ msgid "Right:"
+#~ msgstr "HЬjre:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sektioner:"
+
+#~ msgid "Shading"
+#~ msgstr "SkyggelФgning"
+
+#~ msgid "Size:"
+#~ msgstr "StЬrrelse:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Start pЕ en ny side"
+
+#~ msgid "Style name:"
+#~ msgstr "Stilnavn:"
+
+#~ msgid "Top:"
+#~ msgstr "Top:"
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Width:"
+#~ msgstr "Bredde:"
+
+#~ msgid "label26"
+#~ msgstr "etiket26"
+
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>Fejl ved indlФsning af kalender</b>Kalenderen er i brug."
+
+#~ msgid "Edit appointment"
+#~ msgstr "RedigИr aftale"
+
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "UdsФt-tid (minutter)"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minutter"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minutter"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 timer (AM/PM)"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minutter"
+
+#~ msgid "24 hour"
+#~ msgstr "24 timer"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minutter"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minutter"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmer afbrydes efter"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Lyd-alarmer"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pip nЕr alarmvinduet kommer til syne."
+
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "OpsФtning af kalender"
+
+#~ msgid "Colors"
+#~ msgstr "Farver"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Sammenpres weekender"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Alternativer for datonavigator"
+
+#~ msgid "Defaults"
+#~ msgstr "Forvalg"
+
+#~ msgid "Display options"
+#~ msgstr "Vis valgmuligheder"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "SlЕ udsФttelse til for"
+
+#~ msgid "End of day:"
+#~ msgstr "Dagen slutter:"
+
+#~ msgid "First day of week:"
+#~ msgstr "Ugens fЬrste dag:"
+
+#~ msgid "Highlight"
+#~ msgstr "FremhФv:"
+
+#~ msgid "Items Due Today"
+#~ msgstr "Punkter som skal afsluttes idag"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Punkter som skal afsluttes idag:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Punkter som ikke skal afsluttes endnu"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Punkter som ikke skal afsluttes endnu:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "Overskredne opgaver"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Overskredne opgaver:"
+
+#~ msgid "Pick a color"
+#~ msgstr "VФlg en farve"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "PЕmind mig om alle aftaler"
+
+#~ msgid "Reminders"
+#~ msgstr "PЕmindelser"
+
+#~ msgid "Show"
+#~ msgstr "Vis"
+
+#~ msgid "Show appointment end times"
+#~ msgstr "Vis sluttider for aftaler"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Vis ugenumre"
+
+#~ msgid "Start of day:"
+#~ msgstr "Dagens starter:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Opgaveblok"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tid til afslutning"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Tidsopdeling:"
+
+#~ msgid "Time format:"
+#~ msgstr "Tidsformat:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
+
+#~ msgid "Work week"
+#~ msgstr "Arbejdsuge"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutter fЬr de skal ske."
+
+#~ msgid "seconds."
+#~ msgstr "sekunder."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% fФrdi_g:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "_Klassificering"
+
+#~ msgid "Cancelled"
+#~ msgstr "Afbrudt"
 
-#: ui/evolution.xml.h:7
-msgid "Show information about Evolution"
-msgstr "Vis oplysninger om Evolution"
+#~ msgid "Completed"
+#~ msgstr "FuldfЬrt"
 
-#: ui/evolution.xml.h:8
-msgid "Show the _Folder Bar"
-msgstr "Vis mappe_bjФlken"
+#~ msgid "Date Completed:"
+#~ msgstr "FuldfЬrt dato:"
 
-#: ui/evolution.xml.h:9
-msgid "Show the _Shortcut Bar"
-msgstr "Vis genvejsbjФlken"
+#~ msgid "High"
+#~ msgstr "HЬj"
 
-#: ui/evolution.xml.h:10
-msgid "Submit _Bug Report"
-msgstr "Indsend _fejlrapport"
+#~ msgid "In Progress"
+#~ msgstr "Under udarbejdelse"
 
-#: ui/evolution.xml.h:11
-msgid "Submit bug report using Bug Buddy."
-msgstr "Indsend fejlrapport med Fejl-Frede."
+#~ msgid "Low"
+#~ msgstr "Lav"
 
-#: ui/evolution.xml.h:12
-msgid "Toggle whether to show the folder bar"
-msgstr "SlЕ visning af mappelinjen til/fra"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: ui/evolution.xml.h:13
-msgid "Toggle whether to show the shortcut bar"
-msgstr "SlЕ visning af genvejslinjen til/fra"
+#~ msgid "Not Started"
+#~ msgstr "Ikke startet"
 
-#: ui/evolution.xml.h:14
-msgid "Using the C_ontact Manager"
-msgstr "Bruger behandleren af kontakter"
+#~ msgid "S_ummary"
+#~ msgstr "_Sammendrag"
 
-#: ui/evolution.xml.h:15
-msgid "Using the _Calendar"
-msgstr "Brug af kalenderen"
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Sta_rt dato:"
 
-#: ui/evolution.xml.h:16
-msgid "Using the _Mailer"
-msgstr "Brug af postdelen"
+#~ msgid "Task"
+#~ msgstr "Opgave"
 
-#: ui/evolution.xml.h:17
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#: ui/evolution.xml.h:18
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale"
+#~ msgid "Undefined"
+#~ msgstr "Udefineret"
 
-#: ui/evolution.xml.h:19
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontakter..."
 
-#: ui/evolution.xml.h:22
-msgid "_Folder"
-msgstr "_Mapper"
+#~ msgid "_Due Date:"
+#~ msgstr "Slut-_dato:"
 
-#: ui/evolution.xml.h:23
-msgid "_Go to Folder..."
-msgstr "_GЕ til mappe..."
+#~ msgid "_Priority:"
+#~ msgstr "_Prioritet:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Status:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "Kunne ikke oprette en opgavefil i '%s'"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Varer he_le dagen"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "GrundlФggende om aftaler"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Egendefineret genindtrФffelse"
+
+#~ msgid "Days"
+#~ msgstr "Dage"
+
+#~ msgid "Every"
+#~ msgstr "Hver"
+
+#~ msgid "Exceptions"
+#~ msgstr "Undtagelser"
+
+#~ msgid "Hours"
+#~ msgstr "Timer"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Send _til:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutter"
+
+#~ msgid "Modify"
+#~ msgstr "фndr"
+
+#~ msgid "No recurrence"
+#~ msgstr "Ingen genindtrФffelse"
+
+#~ msgid "Preview"
+#~ msgstr "Smugkig"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Of_fentlig"
+
+#~ msgid "Recurrence"
+#~ msgstr "Gentagelse"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for genindtrФffelse"
+
+#~ msgid "Reminder"
+#~ msgstr "PЕmindelse"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Simpel genindtrФffelse"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Sa_mmendrag:"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "_Audio"
+#~ msgstr "_Lyd"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Fortrolig"
+
+#~ msgid "_Contacts"
+#~ msgstr "_Kontakter"
+
+#~ msgid "_Display"
+#~ msgstr "_Vis"
+
+#~ msgid "_End time:"
+#~ msgstr "S_lut-tid:"
+
+#~ msgid "_Mail"
+#~ msgstr "_E-post"
+
+#~ msgid "_Program"
+#~ msgstr "_Program"
+
+#~ msgid "_Run program:"
+#~ msgstr "KЬ_r program:"
+
+#~ msgid "_Start time:"
+#~ msgstr "_Start-tid:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Start dato:"
+
+#~ msgid "day(s)"
+#~ msgstr "dag(e)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "for"
+
+#~ msgid "forever"
+#~ msgstr "for evigt"
+
+#~ msgid "label21"
+#~ msgstr "etiket21"
+
+#~ msgid "month(s)"
+#~ msgstr "mЕned(er)"
+
+#~ msgid "until"
+#~ msgstr "til"
+
+#~ msgid "week(s)"
+#~ msgstr "uge(r)"
+
+#~ msgid "year(s)"
+#~ msgstr "Еr"
+
+#~ msgid "Could not create a folder in `%s'"
+#~ msgstr "Kinne ikke oprette en mappe i '%s'"
+
+#~ msgid "April"
+#~ msgstr "april"
+
+#~ msgid "August"
+#~ msgstr "august"
+
+#~ msgid "December"
+#~ msgstr "december"
+
+#~ msgid "February"
+#~ msgstr "februar"
+
+#~ msgid "Go To Date"
+#~ msgstr "GЕ til dato"
+
+#~ msgid "Go To Today"
+#~ msgstr "GЕ til i dag"
+
+#~ msgid "January"
+#~ msgstr "januar"
+
+#~ msgid "July"
+#~ msgstr "juli"
+
+#~ msgid "June"
+#~ msgstr "juni"
+
+#~ msgid "March"
+#~ msgstr "marts"
+
+#~ msgid "May"
+#~ msgstr "maj"
+
+#~ msgid "November"
+#~ msgstr "november"
+
+#~ msgid "October"
+#~ msgstr "oktober"
+
+#~ msgid "September"
+#~ msgstr "september"
+
+#~ msgid "Attachment properties"
+#~ msgstr "Egenskaber for bilag"
+
+#~ msgid "File name:"
+#~ msgstr "Filnavn:"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME-type:"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "RedigИr VMapper"
+
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregler"
+
+#~ msgid "Incoming"
+#~ msgstr "Indkommende"
+
+#~ msgid "Outgoing"
+#~ msgstr "UdgЕende"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Visuelle mapper"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "VMappe-kilder"
+
+#~ msgid "Current store format:"
+#~ msgstr "NuvФrende gemningsformat:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Postkasseformat"
+
+#~ msgid "New store format:"
+#~ msgstr "Nyt gemningsformat:"
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Account Information"
+#~ msgstr "kontoinformation"
+
+#~ msgid "Account Management"
+#~ msgstr "Kontoadministration"
+
+#~ msgid "Account Properties"
+#~ msgstr "Egenskaber for konto"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanceret"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentiseringtype:"
+
+#~ msgid ""
+#~ "Congratulations, your mail configuration is complete.\n"
+#~ "\n"
+#~ "You are now ready to send and receive email \n"
+#~ "using Evolution. \n"
+#~ "\n"
+#~ "Click \"Finish\" to save your settings."
+#~ msgstr ""
+#~ "Din epost-konfiguration er nu komplet.\n"
+#~ "Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Gjort"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Email Address:"
+#~ msgstr "Epostadresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Konfiguration af Evolution epost"
+
+#~ msgid "Full Name:"
+#~ msgstr "Fulde navn:"
+
+#~ msgid "Hostname:"
+#~ msgstr "VФrtsnavn:"
+
+#~ msgid "Identity"
+#~ msgstr "Identitet"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server for indkommende post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Behold post pЕ server"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "Epostkonto"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Konfiguration af epost"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Konfigurationguide for epost"
+
+#~ msgid "Make this my default account"
+#~ msgstr "GЬr dette til min standardkonto"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskelligt"
+
+#~ msgid "News"
+#~ msgstr "Nyheder"
+
+#~ msgid "Optional"
+#~ msgstr "Alternativ"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisation:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Server for udgЕende post"
+
+#~ msgid "Password:"
+#~ msgstr "Adgangskode:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Almindelig tekst"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Modtager post"
+
+#~ msgid "Remember my password"
+#~ msgstr "Husk min adgangskode"
+
+#~ msgid "Required"
+#~ msgstr "NЬdvendigt"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Gem adgangskode"
+
+#~ msgid "Select signature file"
+#~ msgstr "VФlg signaturfil"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sender post"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Konfiguration af server"
+
+#~ msgid "Server Type: "
+#~ msgstr "Tjenertype:"
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Server krФver autentificering"
+
+#~ msgid "Servers"
+#~ msgstr "Servere"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Denne server krЬver en sikker forbindelse (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Indtast navnet som du Ьnsker at bruge for disse servere. For eksempel: 'job' "
+#~ "eller 'hjemme'."
+
+#~ msgid "User Information"
+#~ msgstr "Brugerinformation"
+
+#~ msgid "Username:"
+#~ msgstr "Brugernavn:"
+
+#~ msgid "Create a new contact"
+#~ msgstr "Opret en ny kontakt"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Slet en kontakt"
+
+#~ msgid "Find a contact"
+#~ msgstr "Find kontakt"
+
+#~ 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 "_Addressbook Configuration..."
+#~ msgstr "Konfiguration af _adressebog..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Udskriv kontakter..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_SЬg efter kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "Fem dage"
+
+#~ 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 "Delete this item"
+#~ msgstr "Slet dette punkt"
+
+#~ msgid "Delete..."
+#~ msgstr "Slet..."
+
+#~ msgid "Help"
+#~ msgstr "HjФlp"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Skriv kuvert..."
+
+#~ 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 "Send _message to contact..."
+#~ msgstr "Ny _meddelelse til kontaktperson"
+
+#~ msgid "_Print..."
+#~ msgstr "_Udskriv..."
+
+#~ msgid "Close this appointment"
+#~ msgstr "Luk denne aftale"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "RET: _Ny aftale"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gem aftalen og luk dialogboksen"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "PlanlФg mЬde"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "_PlanlФg mЬde"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "OpsФt et eller andet mЬde"
+
+#~ 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 "Hide _Read messages"
+#~ msgstr "Skjul _lФste beskeder"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "Brev_filtre..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Behandl abonnementer..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "MФrk som _lФst"
+
+#~ msgid "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 "Vis udskrift 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 "VMappe for _afsender"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VMappe for _modtagere"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vis rЕ beskedskildetekst"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Anvend filtre"
 
-#: ui/evolution.xml.h:25
 #, fuzzy
-msgid "_Import file..."
-msgstr "_ImportИr fil..."
+#~ msgid "_Configure Folder..."
+#~ msgstr "_KonfigurИr mappe..."
 
-#: ui/evolution.xml.h:26
-msgid "_Index"
-msgstr "_Indeks"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_KopiИr til mappe..."
 
-#: ui/evolution.xml.h:27
-msgid "_Mail message"
-msgstr "_Afsend besked"
+#~ msgid "_Edit Message"
+#~ msgstr "_RedigИr besked"
 
-#: ui/evolution.xml.h:29
-msgid "_Settings"
-msgstr "_OpsФtning"
+#~ msgid "_Expunge"
+#~ msgstr "_TЬm skrФldespand"
 
-#: ui/evolution.xml.h:30
-msgid "_Task (FIXME)"
-msgstr "Opgave"
+#~ msgid "_Filter on Subject"
+#~ msgstr "_FiltrИr efter emne"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d. %B %Y"
+#~ msgid "_Forward"
+#~ msgstr "_Videresend"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
+#~ msgid "_Invert Selection"
+#~ msgstr "Re_versИr udvalg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Optaget"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Konfiguration af epost..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ude"
+#~ msgid "_Message"
+#~ msgstr "_Besked"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen information"
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Flyt til mappe..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_InvitИr andre..."
+#~ msgid "_Open in New Window"
+#~ msgstr "_еbn i nyt vindue"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
+#~ msgid "_Print Message"
+#~ msgstr "_Udskriv besked"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbejdstid"
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gem besked som..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ud"
+#~ msgid "_Threaded"
+#~ msgstr "_TrЕdet"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Opdater fri/optaget"
+#~ msgid "_Undelete"
+#~ msgstr "_Fortryd sletning"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VMappe for emne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_AutovФlg"
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Redigering af _virtuelle mapper..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "Attach"
+#~ msgstr "VedhФft"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og resurser"
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "KryptИr denne besked med PGP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en resurse"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_NЬdvendige mennesker"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "IndsФt en fil som tekst i meddelelsen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "NЬdvendige mennesker _og en resurse"
+#~ msgid "Insert text file..."
+#~ msgstr "IndsФt tekstfil..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for mЬdets _start:"
+#~ msgid "Open a file"
+#~ msgstr "еbn en fil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for mЬdets slutning:"
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP-kryptering"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltagere"
+#~ msgid "PGP Sign"
+#~ msgstr "PGP-underskrift"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "mtotfls"
+#~ msgid "Save As"
+#~ msgstr "Gem som"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gem i _mappe..."
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Save in folder..."
+#~ msgstr "Gem i mappe..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nu"
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Gem den aktive fil med et andet navn"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Gem meddelelsen i en angivet mappe"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr " "
+#~ msgid "Send"
+#~ msgstr "Send"
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "_SЬg..."
+#~ msgid "Send _Later"
+#~ msgstr "Send _senere"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
+#~ 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 "Show / hide attachments"
+#~ msgstr "Vis/skjul bilag"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Vis _bilag"
+
+#~ msgid "Show attachments"
+#~ msgstr "Vis bilag"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Underskriver denne besked med din PGP-nЬgle"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_IndsФt tekstfil..."
+
+#~ msgid "_Open..."
+#~ msgstr "_еbn..."
+
+#~ msgid "_Security"
+#~ msgstr "_Sikkerhed"
+
+#~ 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..."
+
+#, fuzzy
+#~ msgid "_Import file..."
+#~ msgstr "_ImportИr fil..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Afsend besked"
+
+#~ msgid "_Settings"
+#~ msgstr "_OpsФtning"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Opgave"
 
 #~ msgid " for "
 #~ msgstr "for"
@@ -7631,48 +7060,6 @@ msgstr "Gruppe %i"
 #~ "NЕr du klikker pЕ en dag vil du flytte\n"
 #~ "dig til denne dato."
 
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "MФrk som _ulФst"
-
-#~ msgid "FIXME: _New Contact"
-#~ msgstr "_Ny kontaktperson"
-
-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "Ny _Kontaktperson fra samme organisation"
-
-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "Nyt _brev til kontaktperson"
-
-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "Nyt _brev til kontaktperson"
-
-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "Nyt _mЬde med kontakt"
-
-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "_PlanlФg et mЬde..."
-
-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "_Ny _Opgave for kontakt"
-
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "Ny _journalopfЬring for kontakt"
-
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "_Flag for opfЬlgning..."
-
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "_Vis sammenhФng mellem adresser"
-
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "_еbn netside"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "_NФste"
-
 #~ msgid "may"
 #~ msgstr "maj"
 
diff --git a/po/de.po b/po/de.po
index b489a70b63..1a33c54e93 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,11 +3,11 @@
 # Kai Lahmann <kl@linuxfaqs.de>, 2000.
 # Matthias Warkus <mawa@iname.com>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-01-07 15:45+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-07 16:37+01:00\n"
 "Last-Translator: Benedikt Roth <Benedikt.Roth@gmx.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -15,11 +15,188 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"Kann die Evolution-Mailzusammenfassungs-Komponente nicht initialisieren."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Konnte Bonobo nicht initialisieren"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX-Maildateien im mbox-Format"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Keine solche Nachricht"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Rufe E-Mail von %s ab"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Schlieъen"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "In Ordner verschieben"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Zum vorigen Eintrag gehen"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Zum nДchsten Eintrag gehen"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Ordner konfigurieren"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Datei %s konnte nicht geЖffnet werden:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Fehler beim Lesen der Maildatei: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Kein Fehler"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Testverbindung mit \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Neu"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Einen neuen Ordner anlegen"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Konnte Bonobo nicht initialisieren"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -27,7 +204,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -35,7 +212,7 @@ msgstr ""
 "\n"
 "  PrДfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -43,7 +220,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -51,7 +228,7 @@ msgstr ""
 "\n"
 "  ZusДtzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -59,7 +236,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -67,7 +244,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -75,7 +252,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -83,7 +260,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -91,7 +268,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -99,7 +276,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -107,7 +284,7 @@ msgstr ""
 "\n"
 "  Straъe:     "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -115,7 +292,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -123,7 +300,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +308,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -139,7 +316,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -147,7 +324,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -155,7 +332,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -163,7 +340,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -171,7 +348,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -179,7 +356,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -187,7 +364,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -195,7 +372,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -203,7 +380,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -211,7 +388,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -219,7 +396,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -227,7 +404,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -235,7 +412,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -243,7 +420,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -251,7 +428,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -259,7 +436,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -267,7 +444,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -285,7 +462,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -293,7 +470,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -301,17 +478,6 @@ msgstr ""
 "\n"
 "жffentlicher SchlЭssel: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Konnte Bonobo nicht initialisieren"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -431,40 +597,32 @@ msgstr ""
 "Ein Fehler trat beim dem Versuch auf, die Pilot-\n"
 "Liste vom gnome-pilot-DДmon zu lesen"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Konnte den wombat-Server nicht starten"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Konnte wombat nicht starten"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
 
 #.
-#. * 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 "Kontakt lЖschen?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -474,7 +632,7 @@ msgid "_Add"
 msgstr "HinzufЭgen"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "LЖschen"
 
@@ -487,14 +645,7 @@ msgstr "Telefon-Typen"
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
-#.
-#. * 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/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config-druid.glade.h:10
-#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "HinzufЭgen"
 
@@ -552,7 +703,6 @@ msgid "C_ontacts..."
 msgstr "Kontakte..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -569,7 +719,6 @@ msgid "_Address..."
 msgstr "Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config-druid.glade.h:31
 msgid "General"
 msgstr "Allgemein"
 
@@ -614,24 +763,27 @@ msgid "No_tes:"
 msgstr "Notizen:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Details"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "GeschДftlich"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "GeschДftlich 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "GeschДftliches Fax"
 
@@ -640,6 +792,7 @@ msgid "Callback"
 msgstr "RЭckruf"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Auto"
 
@@ -649,28 +802,33 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Andere"
 
@@ -679,10 +837,12 @@ msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "PrimДr"
 
@@ -699,62 +859,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-Mail 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-Mail 3"
 
 #.
-#. * 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 "Kanada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Adresse prЭfen"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Land:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finnland"
-
-#: 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 "Ort:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Postfach:"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Staat/Bundesland:"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "Postleitzahl/_ZIP:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -820,12 +934,7 @@ msgstr "Suffix:"
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als Tabelle"
 
@@ -860,27 +969,27 @@ msgstr ""
 "mЭssen Sie OpenLDAP herunterladen, installieren, \n"
 "und Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthДlt"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Name enthДlt"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-Mail enthДlt"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -905,9 +1014,9 @@ msgid "None (anonymous mode)"
 msgstr "Kein (Anonymer Modus)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Passwort"
 
@@ -940,12 +1049,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config-druid.glade.h:32
 msgid "Host:"
 msgstr "Host-Computer:"
 
@@ -962,12 +1069,10 @@ msgid "Search Scope:"
 msgstr "Suche-Bereich:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943 po/tmp/mail-config-druid.glade.h:14
 msgid "Authentication:"
 msgstr "Authentikation:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934 po/tmp/mail-config-druid.glade.h:51
 msgid "Path:"
 msgstr "Pfad:"
 
@@ -987,192 +1092,94 @@ msgstr "Adressbuch hinzufЭgen"
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
-msgstr "WДhlen Sie den Typ ihres Adressbuches und geben Sie die relevanten Informationen ein."
+msgstr ""
+"WДhlen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
+"Informationen ein."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config-druid.glade.h:44
 msgid "Name:"
 msgstr "Name:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Adressbuch-Quellen"
-
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:685 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: 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-druid.glade.h:24 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "LЖschen"
-
-#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config-druid.glade.h:27
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Name"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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 "Suchen..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "NachrichtenempfДnger"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Namen wДhlen"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-msgstr "Name wДhlen aus:"
-
 #: 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.
-#. * 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"
-
-#: 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Als VCard speichern"
 
-#: po/tmp/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Name"
 
-#: po/tmp/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-Mail 2"
 
-#: po/tmp/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisation"
 
-#: po/tmp/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: po/tmp/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "Abteilung:"
 
-#: po/tmp/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "BЭro:"
 
-#: po/tmp/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "Titel:"
 
-#: po/tmp/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "Beruf:"
 
-#: po/tmp/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Pager"
 
-#: po/tmp/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Spitzname:"
 
-#: po/tmp/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "Partner:"
 
-#: po/tmp/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Keine"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Als VCard speichern"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1186,178 +1193,6 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#.
-#. * 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 Punkt Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 Punkt Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Leere Formulare am Ende:"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "TextkЖrper"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Unten:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Ausmaъe:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Schrifart..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Schrifarten"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Fuъzeile:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Format"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Kopfzeile"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Kopf-/Fuъzeile"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "эberschriften"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "эberschriften fЭr jeden Buchstaben"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "HЖhe:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Folgen einander unmittelbar"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Dazunehmen:"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Querformat"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Links:"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Buchstabenreiter an der Seite"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "RДnder"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Anzahl Spalten:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Optionen"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Ausrichtung"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Seite"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Seite einrichten:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papier"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Papierquelle:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Hochformat"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Vorschau:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Mit grauer Schattierung drucken"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Auf geraden Seiten umkehren"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Rechts:"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Abschnitte:"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Schattierung"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "GrЖъe:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Auf einer neuen Seite beginnen"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Stilname:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Oben:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config-druid.glade.h:73
-msgid "Type:"
-msgstr "Typ:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Breite:"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution-Kalender-Verbindung"
@@ -1366,13 +1201,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
 
@@ -1384,30 +1219,47 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
+msgstr "Erinnerung an Ihren Termin am "
+
+#: calendar/gui/alarm-notify.c:876
+msgid "Snooze"
+msgstr "Weiterschlafen"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "OK"
+
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Kalender Жffnen"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte ЭberprЭfen Sie Ihre ORBit und OAF Einstellungen. "
+msgstr ""
+"Die Kalender-Ansicht konnte nicht erstellt werden. Bitte ЭberprЭfen Sie Ihre "
+"ORBit und OAF Einstellungen. "
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1415,57 +1267,57 @@ msgstr "%a, %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:326 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "жffentlich"
 
-#: calendar/gui/calendar-model.c:329 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:332 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1477,7 +1329,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1485,27 +1337,27 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:845
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:848
+#: calendar/gui/calendar-model.c:896
 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:852
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H.%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1515,742 +1367,409 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 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:1055
+#: calendar/gui/calendar-model.c:1103
 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:125
-msgid "The URI that the calendar will display"
-msgstr "Der URI, den der Kalender anzeigen wird"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm am %A, %d. %b %Y um %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Hinweis auf Ihren Termin am %A, %d. %b %Y um %H.%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
-msgid "No summary available."
-msgstr "Keine Zusammenfassung verfЭgbar."
-
-#.
-#. * 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 "Schlieъen"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Termin bearbeiten"
-
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Weiterschlafen"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Weiterschlaf-Zeit (Minuten)"
-
-#.
-#. * 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 Minuten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 Minuten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 Stunden (am/pm)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 Minuten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 Stunden"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 Minuten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 Minuten"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Alarme schweigen nach"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Audio-Alarme"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Piepsen, wenn Alarmfenster erscheinen."
-
-#: po/tmp/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Kalender"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Kalender-Einstellungen"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Farben"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Wochenenden komprimieren"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Optionen zum Datumsnavigator"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Voreinstellungen"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Anzeigeoptionen"
-
-#: po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "FДllig am"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Weiterschlafen aktivieren fЭr "
-
-#: po/tmp/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Ende des Tages:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Erster Tag der Woche:"
-
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "Fr"
-
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "Freitag"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Markieren"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Heute fДllige EintrДge"
-
-#: po/tmp/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Heute fДllige EintrДge:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr "Noch nicht fДllige EintrДge"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "Noch nicht fДllige EintrДge:"
-
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Mo"
-
-#: calendar/gui/event-editor.c:434 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"
-
-#: po/tmp/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "эberfДllige EintrДge:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Eine Farbe auswДhlen"
-
-#: filter/libfilter-i18n.h:31 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "PrioritДt"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Mich an alle Termine erinnern,"
+#: calendar/gui/calendar-summary.c:97
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d. %B %Y"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr "Erinnerungen"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "Sa"
+#: calendar/gui/calendar-summary.c:302
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Fehler beim Laden der Datei: %s"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "Samstag"
+#: calendar/gui/calendar-summary.c:314
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Anzeigen"
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "Anzeige"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
 msgstr "Endzeiten von Terminen anzeigen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Wochennummern zeigen"
-
-#: 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/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "So"
-
-#: calendar/gui/event-editor.c:440 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/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "Do"
-
-#: calendar/gui/event-editor.c:437 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"
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Zeit-Unterteilungen:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Zeitformat:"
-
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Di"
-
-#: calendar/gui/event-editor.c:435 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/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Anlagen zeigen"
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Mi"
+#: calendar/gui/calendar-summary.c:583
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Kalender drucken"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
+msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Arbeitswoche"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm am %A, %d. %b %Y um %H.%M"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "Minuten bevor sie auftreten."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr "Hinweis auf Ihren Termin am %A, %d. %b %Y um %H.%M"
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "Sekunden."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
+msgstr "Keine Zusammenfassung verfЭgbar."
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" lЖschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin lЖschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 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 "% abgeschlossen:"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "Klassifikation:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Abbgebrochen"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Abgeschlossen am:"
-
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Hoch"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-#, fuzzy
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Niedrig"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config-druid.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Keine"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Nicht gestartet"
-
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "Zusammenfassung"
-
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Anfangsdatum:"
-
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Auftrag"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "Kontakte..."
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr "FДllig am:"
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_PrioritДt:"
-
-#: 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:690
 msgid "Edit Task"
 msgstr "Auftrag bearbeiten"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Auftrag - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal-Eintrag  - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3273
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die дnderungen speichern?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "Kategorien"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Klassifikation"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Endzeit:"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Anfangsdatum:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "FДllig am"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Den Auftrag als abgeschlossen markieren"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "PrioritДt"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Transparent"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarme"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "жffnen..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Den Auftrag Жffnen"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Den Auftrag als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "LЖschen"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Diesen Auftrag lЖschen"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Diesen Termin bearbeiten..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Diesen Termin lЖschen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Diesen Termin beweglich machen"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Dieses Auftreten lЖschen"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Jedes Auftreten lЖschen"
 
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"Kategorien: "
+
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Konnte den Kalender in `%s' nicht laden"
+
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
+"Die Methode, die zum Laden von `%s' benЖtigt wird, ist nicht unterstЭtzt"
+
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d. %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "GanztДgiges Ereignis"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Termin-Grundeinstellungen"
-
-#: po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Tage"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Alle"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Ausnahmen"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Stunden"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Mail an:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minuten"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "дndern"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr "Vorschau"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Privat"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "жffentlich"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr "Wiederholungsregel"
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "Zusammenfassung:"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Zeit"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "Audio"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "Vertraulich"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Kontakte"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "Anzeige"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Endzeit:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "Mail"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "_Programm"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "Programm ausfЭhren:"
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "Anfangszeit:"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "Anfangsdatum:"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
-msgstr "Tag(e)"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "fЭr"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "fЭr immer"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "bei"
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "Tag"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr "Monat(e)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Montag"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr "bis"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Dienstag"
 
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr "Woche(n)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Mittwoch"
 
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr "Jahr(e)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Donnerstag"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Freitag"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "bei"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Samstag"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "Tag"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Sonntag"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "Auftreten"
 
-#: calendar/gui/event-editor.c:838
+#: 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.c:3096 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Konnte den Kalender in `%s' nicht laden"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Konnte keinen Kalender in `%s' anlegen"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Ordner `%s' konnte nicht geЖffnet werden:\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' benЖtigt wird, ist nicht unterstЭtzt"
 
-#: calendar/gui/main.c:49
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "So"
+
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Mo"
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Di"
+
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mi"
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Do"
+
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fr"
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sa"
+
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "GNOME Konnte nicht initialisiert werden"
 
@@ -2442,10 +1961,15 @@ msgstr "Aktuelles Jahr (%Y)"
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "Der URI, den der Kalender anzeigen wird"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
@@ -2538,61 +2062,69 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst fЭr %s auf %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Abbgebrochen"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Server getrennt."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Kalender Жffnen"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' benЖtigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Rechner %s gibt es nicht."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, 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:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle fЭr Protokoll `%s' verfЭgbar"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2601,23 +2133,23 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-Zeichenkette `%s' enthДlt kein Protokoll"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-Zeichenkette `%s' enthДlt ein ungЭltiges Protokoll"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer in URL `%s' ist nicht numerisch"
 
 #: camel/providers/imap/camel-imap-auth.c:133
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
@@ -2627,40 +2159,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "UngЭltige Authentikation-Antwort vom Server."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu frЭh."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung fЭr %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -2672,29 +2205,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlЭsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Dies verbindet mit dem IMAP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort fЭr %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2705,14 +2238,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
 #, fuzzy
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im UNIX-MH-Format"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2720,9 +2253,8 @@ 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"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
@@ -2730,7 +2262,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -2935,7 +2467,8 @@ msgstr "Ordner `%s' ist nicht leer. Nicht gelЖscht."
 #: 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."
+msgstr ""
+"Ordner konnte nicht geЖffnet werden: Nachrichtenliste war unvollstДndig."
 
 #: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
@@ -2965,7 +2498,8 @@ msgstr "TemporДre Mailbox konnte nicht angelegt werden: %s"
 #: camel/providers/local/camel-mbox-summary.c:701
 #: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "Zusammenfassungs- und Order-PrЭffehler, sogar nach einer Synchronisation"
+msgstr ""
+"Zusammenfassungs- und Order-PrЭffehler, sogar nach einer Synchronisation"
 
 #: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
@@ -3073,8 +2607,8 @@ msgstr ""
 "Diese Option fЭhrt die Legitimation am NNTP-Server mit einem "
 "unverschlЭsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 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"
@@ -3107,7 +2641,7 @@ msgstr ""
 "om Mail von manchen Web-Mailprovidern und proprietДren E-Mail-Systemen "
 "abzurufen."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3115,7 +2649,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlЭsselten Passwort "
 "verbinden. Viele POP-Server unterstЭtzen nur dies."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3125,29 +2659,29 @@ msgstr ""
 "Эber das APO-Protokoll verbinden. Dies funktioniert evtl. nicht fЭr alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterstЭtzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %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 "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort fЭr %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3156,12 +2690,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3169,7 +2703,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine UnterstЭtzung fЭr den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3178,13 +2712,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config-druid.glade.h:62
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3238,17 +2771,17 @@ msgstr "Mailauslieferung Эber das Programm sendmail"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Zum Ausliefern von Mail Эber einen Mailknotenpunkt im Netz per SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Authentikation nicht benЖtigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3257,13 +2790,12 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlЭsselten Passwort "
 "verbinden. Viele POP-Server unterstЭtzen nur dies."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: po/tmp/mail-config-druid.glade.h:15
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
@@ -3271,95 +2803,96 @@ msgstr ""
 "Dies verbindet mit dem IMAP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Mailauslieferung Эber das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
-msgstr "Nachricht konnte nicht gesendet werden: Sender-Adresse nicht angegeben."
+msgstr ""
+"Nachricht konnte nicht gesendet werden: Sender-Adresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "Nachricht konnte nicht gesendet werden: Sender-Adresse nicht gЭltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht gesendet werden: Keine EmpfДnger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "%s konnte nicht ausgefЭhrt werden: Mail nicht gesendet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "%s konnte nicht ausgefЭhrt werden: Mail nicht gesendet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "sendmail brach mit Signal %s ab: Mail nicht gesendet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3402,12 +2935,11 @@ msgid "attachment"
 msgstr "anlage"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -3423,56 +2955,40 @@ msgstr "Anlage hinzufЭgen..."
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufЭgen"
 
-#.
-#. * 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 "Anlagen-Eigenschaften"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Dateiname:"
-
-#: 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:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Von:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "FЭr das Adressbuch hier klicken"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Gebe die EmpfДnger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3480,11 +2996,11 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "EmpfДngerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Gebe den Betreff der Nachricht an"
 
@@ -3497,38 +3013,38 @@ msgstr ""
 "Signaturdatei %s konnte nicht geЖffnet werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Speichere дnderungen an Nachricht..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "дnderungen an Nachricht speichern..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fehler beim Speichern des Erstellen in 'EntwЭrfe': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3538,27 +3054,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre дnderungen speichern?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Datei Жffnen"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3566,26 +3082,22 @@ 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:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Konnte Erstellungsfenster nicht erzeugen."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Succhen"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "Jahr"
@@ -3718,7 +3230,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
@@ -3821,186 +3333,167 @@ msgstr "Wichtig"
 msgid "Read"
 msgstr "Gelesen"
 
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "VOrdner bearbeiten"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filterregeln"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "Eingang"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "Ausgang"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Virtuelle Ordner"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "vOrdner-Quellen"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "nach"
-
-#: filter/libfilter-i18n.h:3
 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
-msgid "before"
-msgstr "vor"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "enthДlt"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Sendedatum"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Ausdruck"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Weiterleiten an Adresse"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Nachrichtenrumpf"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "enthДlt nicht"
+msgid "Message Header"
+msgstr "Nachrichtenkopf"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "endet nicht mit"
+msgid "Message was received"
+msgstr "Nachricht wurde empfangen"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "existiert nicht"
+msgid "Message was sent"
+msgstr "Nachricht wurde gesendet"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "klingt nicht wie"
+msgid "Move to Folder"
+msgstr "In Ordner verschieben"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "beginnt nicht mit"
+msgid "Recipients"
+msgstr "EmpfДnger"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "endet mit"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "existiert"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Bewertung"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Ausdruck"
+msgid "Sender"
+msgstr "Absender"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Weiterleiten an Adresse"
+msgid "Set Status"
+msgstr "Status setzen:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "ist"
+msgid "Source"
+msgstr "Quelle"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "ist grЖъer als"
+msgid "Specific header"
+msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "ist kleiner als"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "ist nicht"
+msgid "Stop Processing"
+msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Betreff"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
+msgid "after"
+msgstr "nach"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Nachricht wurde empfangen"
+msgid "before"
+msgstr "vor"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Nachricht wurde gesendet"
+msgid "contains"
+msgstr "enthДlt"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
+msgid "does not contain"
+msgstr "enthДlt nicht"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "am oder nach"
+msgid "does not end with"
+msgstr "endet nicht mit"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "am oder vor"
+msgid "does not exist"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "klingt nicht wie"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "EmpfДnger"
+msgid "does not start with"
+msgstr "beginnt nicht mit"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "endet mit"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Absender"
+msgid "exists"
+msgstr "existiert"
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "Status setzen:"
+msgid "is greater than"
+msgstr "ist grЖъer als"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "klingt wie"
+msgid "is less than"
+msgstr "ist kleiner als"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Quelle"
+msgid "is not"
+msgstr "ist nicht"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
+msgid "is"
+msgstr "ist"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "beginnt mit"
+msgid "on or after"
+msgstr "am oder nach"
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Status"
+msgid "on or before"
+msgstr "am oder vor"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Verarbeitung abbrechen"
+msgid "sounds like"
+msgstr "klingt wie"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Betreff"
+msgid "starts with"
+msgstr "beginnt mit"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4018,10 +3511,6 @@ msgstr "Regel hinzufЭgen"
 msgid "Edit Score Rule"
 msgstr "Bewertungsregel bearbeiten"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Bewertung"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "VOrdner-Regel hinzufЭgen"
@@ -4030,174 +3519,166 @@ msgstr "VOrdner-Regel hinzufЭgen"
 msgid "Edit VFolder Rule"
 msgstr "VFolder-Regel bearbeiten"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Speichern"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Ordner wДhlen"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Rumpf oder Betreff enthДlt"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Rumpf enthДlt"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Betreff enthДlt"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Rumpf enthДlt nicht"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Betreff enthДlt nicht"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VOrdner Эber Betreffzeile"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VOrdner Эber Absender"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VOrdner Эber EmpfДnger"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filter Эber Betreffzeile"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filter Эber Absender"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filter Эber EmpfДnger"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filter Эber Mailingliste"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Alle versteckten anzeigen"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "GewДhlte verbergen"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Gelesene verbergen"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "GelЖschte verbergen"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Betreff verbergen"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "жffnen"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
-#, fuzzy
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "Nachrichten verbergen"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter Эber Mailingliste (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Betreff \"%s\" verbergen"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Keine"
 
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Voreingestellt"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+#, fuzzy
+msgid "Evolution Account Manager"
+msgstr "Accountverwaltung"
+
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Evolution-ToDo-Verbindung"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4218,7 +3699,7 @@ msgstr "E-Mail von %s"
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4230,7 +3711,7 @@ msgstr ""
 "empfangen oder erstellen kЖnnen.\n"
 "MЖchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4238,7 +3719,7 @@ msgstr ""
 "Sie mЭssen eine IdentitДt einrichten,\n"
 "bevor Sie Mail erstellen kЖnnen."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4246,19 +3727,15 @@ msgstr ""
 "Sie mЭssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen kЖnnen."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "Sie haben keine Mailquellen konfiguriert"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Sie haben keinen Ordner fЭr ausgehende Mail konfiguriert"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4266,23 +3743,30 @@ msgstr ""
 "Diese Nachricht hat keine Betreffzeile.\n"
 "Wirklich senden?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Sie mЭssen eine IdentitДt einrichten,\n"
+"bevor Sie Mail erstellen kЖnnen."
+
+#: mail/mail-callbacks.c:365
 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:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Weitergeleitete Nachricht:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4290,11 +3774,11 @@ msgstr ""
 "Sie kЖnnen nur im EntwЭrfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Datei Эberschreiben?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4302,15 +3786,15 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "эberschreiben?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4319,445 +3803,32 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#.
-#. * 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 "Account"
-msgstr "Account"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr "Account-Information"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr "Accountverwaltung"
-
-#: po/tmp/mail-config-druid.glade.h:9
-msgid "Account Properties"
-msgstr "Account-Eigenschaften"
-
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr "Komplex"
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr "Authentikation"
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr "Authentikations-Typ:"
-
-#: po/tmp/mail-config-druid.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "GlЭckwunsch! Ihre Mailkonfiguration ist abgeschlossen.\n"
-
-#: po/tmp/mail-config-druid.glade.h:17 po/tmp/mail-config-druid.glade.h:20
-#: po/tmp/mail-config-druid.glade.h:77
-msgid "\n"
-msgstr "\n"
-
-#: po/tmp/mail-config-druid.glade.h:18
-msgid "You are now ready to send and receive email \n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:19
-#, fuzzy
-msgid "using Evolution. \n"
-msgstr "beim der Nutzung von Evolution. \n"
-
-#: po/tmp/mail-config-druid.glade.h:21
-msgid "Click \"Finish\" to save your settings."
-msgstr "Klicken Sie \"Beenden\" um Ihre Einstellungen zu speichern."
-
-#: po/tmp/mail-config-druid.glade.h:22
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config-druid.glade.h:23
-msgid "Default"
-msgstr "Voreingestellt"
-
-#: po/tmp/mail-config-druid.glade.h:25
-msgid "Done"
-msgstr "Fertig"
-
-#: po/tmp/mail-config-druid.glade.h:26
-msgid "E-Mail Address:"
-msgstr "E-Mail Adresse:"
-
-#: po/tmp/mail-config-druid.glade.h:28
-msgid "Email Address:"
-msgstr "E-Mail Adresse:"
-
-#: po/tmp/mail-config-druid.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "Evolution-Mailkonfiguration"
-
-#: po/tmp/mail-config-druid.glade.h:30
-msgid "Full Name:"
-msgstr "Voller Name:"
-
-#: po/tmp/mail-config-druid.glade.h:33
-msgid "Hostname:"
-msgstr "Hostname:"
-
-#: po/tmp/mail-config-druid.glade.h:34
-msgid "Identity"
-msgstr "IdentitДt"
-
-#: po/tmp/mail-config-druid.glade.h:35
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:36
-msgid "Keep mail on server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:37
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config-druid.glade.h:38
-msgid "Mail"
-msgstr "Mail"
-
-#: po/tmp/mail-config-druid.glade.h:39
-msgid "Mail Account"
-msgstr "Mail-Account"
-
-#: po/tmp/mail-config-druid.glade.h:40
-msgid "Mail Configuration"
-msgstr "Mailkonfiguration"
-
-#: po/tmp/mail-config-druid.glade.h:41
-msgid "Mail Configuration Druid"
-msgstr "Mailkonfigurations-Druide"
-
-#: po/tmp/mail-config-druid.glade.h:42
-msgid "Make this my default account"
-msgstr "Dies zu meinem Standardaccount machen"
-
-#: po/tmp/mail-config-druid.glade.h:43
-msgid "Miscellaneous"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:45
-msgid "News"
-msgstr "Nachrichten"
-
-#: po/tmp/mail-config-druid.glade.h:47
-msgid "Optional"
-msgstr "Optional"
-
-#: mail/mail-config-gui.c:485 po/tmp/mail-config-druid.glade.h:48
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: po/tmp/mail-config-druid.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:50
-msgid "Password:"
-msgstr "Passwort:"
-
-#: po/tmp/mail-config-druid.glade.h:52
-msgid "Plain Text"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:53
-msgid "Receiving Email"
-msgstr "Mail erhalten"
-
-#: po/tmp/mail-config-druid.glade.h:54
-msgid "Remember my password"
-msgstr "Passwort speichern"
-
-#: mail/mail-format.c:628 po/tmp/mail-config-druid.glade.h:55
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#: po/tmp/mail-config-druid.glade.h:56
-msgid "Reply-to:"
-msgstr "Antwort an:"
-
-#: po/tmp/mail-config-druid.glade.h:57
-msgid "Required"
-msgstr "BenЖtigt"
-
-#: po/tmp/mail-config-druid.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config-druid.glade.h:59
-msgid "Save password"
-msgstr "Passwort speichern"
-
-#: po/tmp/mail-config-druid.glade.h:60
-msgid "Select signature file"
-msgstr "Signaturdatei wДhlen"
-
-#: po/tmp/mail-config-druid.glade.h:61
-msgid "Sending Email"
-msgstr "Sende E-Mail"
-
-#: po/tmp/mail-config-druid.glade.h:63
-msgid "Server Configuration"
-msgstr "Server-Konfiguration"
-
-#: po/tmp/mail-config-druid.glade.h:64
-msgid "Server Type: "
-msgstr "Servertyp: "
-
-#: po/tmp/mail-config-druid.glade.h:65
-msgid "Server requires authentication"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:66
-msgid "Servers"
-msgstr "Server"
-
-#: mail/mail-config-gui.c:496 po/tmp/mail-config-druid.glade.h:67
-msgid "Signature file:"
-msgstr "Signaturdatei:"
-
-#: po/tmp/mail-config-druid.glade.h:68
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: po/tmp/mail-config-druid.glade.h:69 po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Quellen"
-
-#: po/tmp/mail-config-druid.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "Dieser Server benЖtigt eine sichere Verbindung (SSL)"
-
-#: po/tmp/mail-config-druid.glade.h:71
-msgid "Type"
-msgstr "Typ"
-
-#: po/tmp/mail-config-druid.glade.h:72
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:74
-msgid "User Information"
-msgstr "Benutzer-Information"
-
-#: mail/mail-config-gui.c:928 po/tmp/mail-config-druid.glade.h:75
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: po/tmp/mail-config-druid.glade.h:76
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden!\n"
-
-#: po/tmp/mail-config-druid.glade.h:78
-msgid "Click \"Next\" to begin. "
-msgstr "Klicken Sie \"Weiter\" um zu beginnen."
-
-#: mail/mail-config-gui.c:433
+#: mail/mail-config-druid.c:363
+#, c-format
 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."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Geben Sie den Namen und die E-Mail-Adresse zur Verwendung in Ihrer "
-"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:446
-msgid "Full name:"
-msgstr "Voller Name:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-Mail-Adresse:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Signaturdatei"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Server:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "UnterstЭtzte Typen feststellen..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Nachrichten nicht vom Server lЖschen"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Einstellungen testen"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Mailquellen-Typ:"
-
-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-druid.c:629
+#, c-format
 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."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"WДhlen Sie, welche Art von Mailserver Sie haben, und geben Sie die relevante "
-"Information dazu ein.\n"
-"\n"
-"Wenn der Server Authentikation erfordert, kЖnnen Sie auf \"UnterstЭtzte "
-"Typen feststellen...\" klicken, bevor Sie andere Informationen eingeben."
-
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Newsquellen-Typ:"
 
-#: 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."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"WДhlen Sie, welche Art von Newsserver Sie haben, und geben Sie die relevante "
-"Information dazu ein.\n"
-"\n"
-"Wenn der Server Authentikation erfordert, kЖnnen Sie auf \"UnterstЭtzte "
-"Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
-"eingegeben haben."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Mailtransport-Typ:"
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "IdentitДt hinzufЭgen"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "IdentitДt bearbeiten"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Quelle hinzufЭgen"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Newsserver hinzufЭgen"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Newsserver bearbeiten"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Teste \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Testverbindung mit \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Die Verbindung war erfolgreich!"
-
-#: 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:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Ermittle Autorisation auf \"%s\""
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adresse"
-
-#: po/tmp/mail-config.glade.h:10
-msgid "Identities"
-msgstr "IdentitДten"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Mailquellen"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Mailtransport"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Nachrichten als gesehen markieren [ms]: "
-
-#: po/tmp/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Newsserver"
-
-#: po/tmp/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Newsquellen"
-
-#: 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 "Nachrichten in HTML-Format senden"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Kein Passwort angegeben."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Kein GPG/PGP-Programm verfЭgbar."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "TemporДre Datei konnte nicht angelegt werden: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -4795,66 +3866,65 @@ msgstr "жffnen in %s..."
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (Эber %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:851
-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:626
+msgid "Reply-To:"
+msgstr "Antwort an:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "VerschlЭsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "VerschlЭsselte Nachricht"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Zum EntschlЭsseln Icon klicken."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, 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:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "UngЭltiger external-body-Teil."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4914,150 +3984,173 @@ msgstr "Lokaler Ordner wird registriert"
 msgid "Register local folder"
 msgstr "Lokalen Ordner registrieren"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Fehler beim `%s'_\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Fehler beim Vorbereiten auf %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Verschiebe"
+
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Rufe E-Mail von %s ab"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "E-Mail von %s abrufen"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Es gibt keine neue Mail auf %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtere E-Mail auf Anfrage"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "E-Mail auf Anfrage filtern"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Nachricht senden"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Sende Warteschlange"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Warteschlange senden"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "HДnge \"%s\" an"
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "HДnge eine Nachricht ohne eine Betreffzeile an"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s Nachricht %d von %d (UID \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Keine Beschreibung)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s Жffnen"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Ordner Synchronisieren"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "SДubere Ordner"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Nachrichten abrufen"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Ordner %s fЭr %s laden"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Ordner %s fЭr %s laden"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Nachrichten speichern"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5066,12 +4159,12 @@ msgstr ""
 "Ausgabedatei %s konnte nicht erstellt werden:\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Nachricht %d von %d (UID \"%s\") speichern"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5081,10 +4174,6 @@ msgstr ""
 "%s"
 
 #: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "OK"
-
-#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -5198,111 +4287,190 @@ msgstr "Neuer VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "allen EmpfДngern der Nachricht antworten"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Die gewДhlte Nachricht drucken"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Die Nachricht lЖschen"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:890
 #, 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:896 mail/message-list.c:912
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<Unbekannt>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%a %d %l:%M %p"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Markiert"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "anlage"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "Von:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "FДllig am"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Empfangsdatum"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "An:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "GrЖъe:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Kein GPG/PGP-Programm verfЭgbar."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Kein Passwort angegeben."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "TemporДre Datei konnte nicht angelegt werden: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Ordner"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Bewertung"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Ordner anzeigen, die beginnen mit:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Erhalte Speicher fЭr \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Speicher fЭr \"%s\" erhalten"
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Ordner \"%s\" abonnieren"
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Ordner \"%s\" abbestellen"
@@ -5417,23 +4585,24 @@ msgstr ""
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5443,7 +4612,7 @@ msgstr ""
 "und Kontakt-Management Anwendung\n"
 "innerhalt der GNOME-Desktops."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
@@ -5451,13 +4620,18 @@ msgstr "Gehe zu Ordner..."
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Ordner"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5465,7 +4639,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kann lokalen Speicher nicht einstellen -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5474,15 +4648,15 @@ msgstr ""
 "Hoppla! Die Ansicht fЭr `%s' ist unerwartet gestorben.  :-(\n"
 "Das heiъt wahrscheinlich, dass die %s-Komponente abgestЭrzt ist."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Neue VerknЭpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5491,51 +4665,61 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der VerknЭpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Die VerknЭpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Groъe Icons"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Die VerknЭpfungen als groъe Icons zeigen"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Eine neue VerknЭpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Diese Gruppe entfernen..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Diese VerknЭpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Die VerknЭpfungsleiste anzeigen"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Die VerknЭpfungsleiste anzeigen"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Diese VerknЭpfung aktivieren"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese VerknЭpfung aus der VerknЭpfungsleiste entfernen"
 
@@ -5543,13 +4727,11 @@ msgstr "Diese VerknЭpfung aus der VerknЭpfungsleiste entfernen"
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von VerknЭpfungen."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Ansicht"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Den gewДhlten Ordner betrachten"
 
@@ -5663,1244 +4845,1908 @@ msgstr "Deaktivieren."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kann das Bonobo-System nicht initialisieren."
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Einen neuen Kontakt anlegen"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Neuer Termin"
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Einen Kontakt lЖschen"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Aufgabenanfrage"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Suchen"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Nachricht mailen"
+
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: Kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Einen Kontakt suchen"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: Aufgabe"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Neu"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Aufgabenanfrage"
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Kontakte drucken"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Journal-Eintrag"
 
-#: po/tmp/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Stopp"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Notiz"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Laden abbrechen"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Formular wДhlen..."
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Alle betrachten"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Memo-Stil"
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Alle Kontakte betrachten"
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Druckstile definieren"
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "_Addressbuckkonfiguration..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: Senden"
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Kontakte drucken..."
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Anlagen speichern..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "Nach Kontakten _suchen"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: In Ordner verschieben..."
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "Werkzeuge"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: In Ordner kopieren..."
 
-#.
-#. * 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 Tage"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Seite einrichten:"
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Einstellungen Дndern"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Druckvorschau"
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Ka_lender"
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Besonderes einfЭgen..."
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Kalender-Einstellungen..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Als ungelesen markieren"
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Einen neuen Termin anlegen"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objekt"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Einen neuen Kalender anlegen"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: Eintrag"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Tag"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Ungelesener Eintrag"
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "In der Zeit zurЭckgehen"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Erster Eintrag im Ordner"
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "In der Zeit vorangehen"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: Letzter Eintrag im Ordner"
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Gehe zu"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Zu bestimmtem Datum gehen"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Formatierung"
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Zur aktuellen Zeit gehen"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Anpassen..."
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Monat"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "ZurЭck"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Weiter"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Einen Kalender Жffnen"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Werkzeugleisten"
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "ZurЭck"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _Datei..."
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Diesen Kalender drucken"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: Eintrag..."
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Kalender als etwas anderes speichern"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objekt..."
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Einen Tag zeigen"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: Schriftart..."
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "1 Monat zeigen"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: Absatz..."
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "1 Woche zeigen"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Dieses Formular bearbeiten"
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Die Arbeitswoche zeigen"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ein Formular entwerfen..."
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Heute"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: _Formular verЖffentlichen..."
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Woche"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Formular verЖffentlichen als..."
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
-msgid "_New"
-msgstr "_Neu"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Skriptdebugger"
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "Kalender Жffnen"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: Rechtschreibung..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formulare"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "FIXME: Kontakt"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: Kontakt"
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "Diesen Kalender drucken"
-
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "Speichern _unter..."
-
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Diesen Eintrag lЖschen"
-
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "LЖschen..."
-
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Hilfe"
-
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Umschlag drucken..."
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Diesen Eintrag drucken"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Drucken..."
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Speichern _unter..."
-
-#: 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"
-
-#: 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"
-
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "Kontakt an anderen senden..."
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Online-Hilfe einsehen"
-
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
 msgstr "_Nachricht an Kontakt senden..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
-msgid "_File"
-msgstr "_Datei"
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Kontakt"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "_Drucken..."
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: Rechtschreibung..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Speichern"
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: Kontakt"
 
-#.
-#. * 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 "эber diese Anwendung"
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: _Journal-Eintrag"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: In Ordner kopieren..."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: Nachricht mailen"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: Nachricht mailen"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Als vCalendar weiterleiten"
+
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Weiterleiten"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "EinfЭgen"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Info..."
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "Format"
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "Werkzeuge"
+
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "Aktio_nen"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "_LЖschen"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Voriger"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "Ausschneiden"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Zum vorigen Eintrag gehen"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "LЖschen"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "FIXME: _Notiz"
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Die Auswahl lЖschen"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Zum nДchsten Eintrag gehen"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Diesen Termin abschlieъen"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopieren"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "VorlДufig"
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Die Auswahl kopieren"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "BeschДftigt"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Ausschneiden"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Auъer Haus"
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Die Auswahl ausschneiden"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Keine Information"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "XML auswerfen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "Andere einladen..."
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Die XML-UI-Beschreibung auswerfen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "Optionen"
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Adress_buch..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Nur Arbeitszeit anzeigen"
 
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Formular wДhlen..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Weggezoomt anzeigen"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Namen prЭfen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "Frei/beschДftigt aktualisieren"
 
-#: po/tmp/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: In Ordner kopieren..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "<<"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Ein Formular entwerfen..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "AutoWahl"
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Druckstile definieren"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">>"
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Dieses Formular bearbeiten"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "Alle Leute und Ressourcen"
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Erster Eintrag im Ordner"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle Leute und eine Ressource"
 
-#: po/tmp/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Weiterleiten"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "BenЖtigte Leute"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Als vCalendar weiterleiten"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "BenЖtigte Leute und eine Ressource"
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Hilfe"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Anfang der Besprechung:"
 
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: UnvollstДndige Aufgabe"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Ende der Besprechung:"
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Datei einfЭgen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle Anwesenden"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: Eintrag..."
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MDMDFSS"
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Besonderes einfЭgen..."
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: po/tmp/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Druckvorschau"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Formular verЖffentlichen als..."
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Jetzt"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: _Formular verЖffentlichen..."
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Heute"
 
-#: po/tmp/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Wiederholung..."
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H.%M"
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: Senden"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: po/tmp/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Anlagen speichern..."
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Succhen"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Skriptdebugger"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Aufgabenanfrage"
+#~ msgid "Delete Contact?"
+#~ msgstr "Kontakt lЖschen?"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: Kontakt"
+#~ msgid "Address _2:"
+#~ msgstr "Adresse _2"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Anpassen..."
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datei..."
+#~ msgid "Check Address"
+#~ msgstr "Adresse prЭfen"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: Schriftart..."
+#~ msgid "Countr_y:"
+#~ msgstr "Land:"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: Formatierung"
+#~ msgid "Finland"
+#~ msgstr "Finnland"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: Eintrag"
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Journal-Eintrag"
+#~ msgid "_Address:"
+#~ msgstr "_Adresse:"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: Letzter Eintrag im Ordner"
+#~ msgid "_City:"
+#~ msgstr "Ort:"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Nachricht mailen"
+#~ msgid "_PO Box:"
+#~ msgstr "_Postfach:"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Memo-Stil"
+#~ msgid "_State/Province:"
+#~ msgstr "_Staat/Bundesland:"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: In Ordner verschieben..."
+#~ msgid "_ZIP Code:"
+#~ msgstr "Postleitzahl/_ZIP:"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Neuer Termin"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressbuch-Quellen"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Notiz"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objekt..."
+#~ msgid "Find..."
+#~ msgstr "Suchen..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: Absatz..."
+#~ msgid "Message Recipients"
+#~ msgstr "NachrichtenempfДnger"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: Rechtschreibung..."
+#~ msgid "Select Names"
+#~ msgstr "Namen wДhlen"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standard"
+#~ msgid "Select name from:"
+#~ msgstr "Name wДhlen aus:"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: Aufgabe"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Ungelesener Eintrag"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr "FIXME: was kommt hierher?"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "Format"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Weitersuchen"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Weitersuchen"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Zum nДchsten Eintrag gehen"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Zum vorigen Eintrag gehen"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Eigenschaften der Datei Дndern"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "Weiter"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "EinfЭgen"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Inhalt der Zwischenablage einfЭgen"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "ZurЭck"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Voriger"
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Druckeinstellungen..."
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Druckeinstellungen"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Eigenschaften"
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Wiederherstellen"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Die rЭckgДngig gemachte Aktion wiederherstellen"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Ersetzen"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Eine Zeichenkette ersetzen"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: 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"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Die aktuelle Datei speichern"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Besprechung ansetzen"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "Besprechung ansetzen"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "Eine Besprechung ansetzen"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Noch einmal nach derselben Zeichenkette suchen"
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Eine Zeichenkette suchen"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 Punkt Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Alle auswДhlen"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 Punkt Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Alles auswДhlen"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Leere Formulare am Ende:"
 
-#: 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"
+#~ msgid "Body"
+#~ msgstr "TextkЖrper"
 
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "RЭckgДngig"
+#~ msgid "Bottom:"
+#~ msgstr "Unten:"
 
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Die letzte Aktion rЭckgДngig machen"
+#~ msgid "Dimensions:"
+#~ msgstr "Ausmaъe:"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "Info..."
+#~ msgid "Font..."
+#~ msgstr "Schrifart..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "Schlieъen"
+#~ msgid "Fonts"
+#~ msgstr "Schrifarten"
 
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "Kopieren"
+#~ msgid "Footer:"
+#~ msgstr "Fuъzeile:"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr "_Diagnose"
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Bearbeiten"
+#~ msgid "Header"
+#~ msgstr "Kopfzeile"
 
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "Suchen..."
+#~ msgid "Header/Footer"
+#~ msgstr "Kopf-/Fuъzeile"
 
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formulare"
+#~ msgid "Headings"
+#~ msgstr "эberschriften"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Hilfe"
+#~ msgid "Headings for each letter"
+#~ msgstr "эberschriften fЭr jeden Buchstaben"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "EinfЭgen"
+#~ msgid "Height:"
+#~ msgstr "HЖhe:"
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objekt"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Folgen einander unmittelbar"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "EinfЭgen"
+#~ msgid "Include:"
+#~ msgstr "Dazunehmen:"
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "Drucken"
+#~ msgid "Landscape"
+#~ msgstr "Querformat"
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "Eigenschaften..."
+#~ msgid "Left:"
+#~ msgstr "Links:"
 
-#: po/tmp/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "Wiederherstellen"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Buchstabenreiter an der Seite"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "Ersetzen..."
+#~ msgid "Margins"
+#~ msgstr "RДnder"
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "Werkzeugleisten"
+#~ msgid "Number of columns:"
+#~ msgstr "Anzahl Spalten:"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "RЭckgДngig"
+#~ msgid "Options"
+#~ msgstr "Optionen"
 
-#.
-#. * 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 "Erstellen"
+#~ msgid "Orientation"
+#~ msgstr "Ausrichtung"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Eine neue Nachricht erstellen"
+#~ msgid "Page"
+#~ msgstr "Seite"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Die Nachricht in einen neuen Ordner kopieren"
+#~ msgid "Paper"
+#~ msgstr "Papier"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "Ordner"
+#~ msgid "Paper source:"
+#~ msgstr "Papierquelle:"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Filter Эber Absender"
+#~ msgid "Portrait"
+#~ msgstr "Hochformat"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filter Эber EmpfДnger"
+#~ msgid "Preview:"
+#~ msgstr "Vorschau:"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "PasswЖrter vergessen"
+#~ msgid "Print using gray shading"
+#~ msgstr "Mit grauer Schattierung drucken"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Mail abrufen"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Auf geraden Seiten umkehren"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr "Ge_lЖschte Nachrichten verbergen"
+#~ msgid "Right:"
+#~ msgstr "Rechts:"
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "_Gelesene Nachrichten verbergen"
+#~ msgid "Sections:"
+#~ msgstr "Abschnitte:"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "Die gewДhlte Nachrichten _verbergen"
+#~ msgid "Shading"
+#~ msgstr "Schattierung"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr "Mail-_Filter..."
+#~ msgid "Start on a new page"
+#~ msgstr "Auf einer neuen Seite beginnen"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr "Abonnements verwalten..."
+#~ msgid "Style name:"
+#~ msgstr "Stilname:"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "Als gelesen markieren"
+#~ msgid "Top:"
+#~ msgstr "Oben:"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Als ungelesen markieren"
+#~ msgid "Type:"
+#~ msgstr "Typ:"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Verschieben"
+#~ msgid "Width:"
+#~ msgstr "Breite:"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Die Nachricht in einen neuen Ordner verschieben"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: po/tmp/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
+#~ msgid "Edit appointment"
+#~ msgstr "Termin bearbeiten"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Druckvorschau der Nachricht..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Weiterschlaf-Zeit (Minuten)"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Nachricht auf dem Drucker drucken"
+#~ msgid "05 minutes"
+#~ msgstr "05 Minuten"
 
-#: po/tmp/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Nachricht drucken..."
+#~ msgid "10 minutes"
+#~ msgstr "10 Minuten"
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "_Allen antworten"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 Stunden (am/pm)"
 
-#: po/tmp/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Antwort an Absender"
+#~ msgid "15 minutes"
+#~ msgstr "15 Minuten"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Alle auswДhlen"
+#~ msgid "24 hour"
+#~ msgstr "24 Stunden"
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Mail in der Warteschlange senden und neue Mail abholen"
+#~ msgid "30 minutes"
+#~ msgstr "30 Minuten"
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr "_Alle Nachrichten anzeigen"
+#~ msgid "60 minutes"
+#~ msgstr "60 Minuten"
 
-#: po/tmp/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Nachrichtenliste in StrДnge geordnet"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarme schweigen nach"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "VOrdner Эber Absender"
+#~ msgid "Audio Alarms"
+#~ msgstr "Audio-Alarme"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "VOrdner Эber EmpfДnger"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr "Nachrichtenquellcode anzeigen"
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "Filter _anwenden"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalender-Einstellungen"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "Ordner konfigurieren"
+#~ msgid "Colors"
+#~ msgstr "Farben"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "In Ordner kopieren..."
+#~ msgid "Compress weekends"
+#~ msgstr "Wochenenden komprimieren"
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "Nachricht bearbeiten"
+#~ msgid "Date navigator options"
+#~ msgstr "Optionen zum Datumsnavigator"
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "SДubern"
+#~ msgid "Defaults"
+#~ msgstr "Voreinstellungen"
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "Filter Эber Betreffzeile"
+#~ msgid "Display options"
+#~ msgstr "Anzeigeoptionen"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "Weiterleiten"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Weiterschlafen aktivieren fЭr "
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "Auswahl umkehren"
+#~ msgid "End of day:"
+#~ msgstr "Ende des Tages:"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "_Mailkonfiguration..."
+#~ msgid "First day of week:"
+#~ msgstr "Erster Tag der Woche:"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "Nachricht"
+#~ msgid "Highlight"
+#~ msgstr "Markieren"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "In Ordner verschieben..."
+#~ msgid "Items Due Today"
+#~ msgstr "Heute fДllige EintrДge"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "In neuem Fenster Жffnen"
+#~ msgid "Items Due Today:"
+#~ msgstr "Heute fДllige EintrДge:"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "Nachricht drucken"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Noch nicht fДllige EintrДge"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "Nachricht _Speichern unter..."
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Noch nicht fДllige EintrДge:"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Quelle"
+#~ msgid "Overdue Items"
+#~ msgstr "эberfДllige EintrДge"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "In S_trДngen"
+#~ msgid "Overdue Items:"
+#~ msgstr "эberfДllige EintrДge:"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "LЖschen rЭckgДngig"
+#~ msgid "Pick a color"
+#~ msgstr "Eine Farbe auswДhlen"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "VOrdner Эber Betreffzeile"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Mich an alle Termine erinnern,"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "Editor fЭr _virtuelle Ordner..."
+#~ msgid "Reminders"
+#~ msgstr "Erinnerungen"
 
-#.
-#. * 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 "Beilegen"
+#~ msgid "Show"
+#~ msgstr "Anzeigen"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Die aktuelle Datei schlieъen"
+#~ msgid "Show week numbers"
+#~ msgstr "Wochennummern zeigen"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Diese Nachricht mit PGP verschlЭsseln"
+#~ msgid "Start of day:"
+#~ msgstr "Anfang des Tages:"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "TaskPad"
+#~ msgstr "Auftragsblock"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Eine Datei als Text in die Nachricht einfЭgen"
+#~ msgid "Time Until Due"
+#~ msgstr "Zeit bis FДlligkeit"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Textdatei einfЭgen..."
+#~ msgid "Time divisions:"
+#~ msgstr "Zeit-Unterteilungen:"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Eine Datei Жffnen"
+#~ msgid "Time format:"
+#~ msgstr "Zeitformat:"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle Alarme"
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Work week"
+#~ msgstr "Arbeitswoche"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Speichern _unter"
+#~ msgid "minutes before they occur."
+#~ msgstr "Minuten bevor sie auftreten."
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "In Ordner speichern... (FIXME)"
+#~ msgid "seconds."
+#~ msgstr "Sekunden."
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "In Ordner speichern..."
+#~ msgid "% Comp_lete:"
+#~ msgstr "% abgeschlossen:"
 
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "Die aktuelle Datei unter anderem Namen speichern"
+#~ msgid "C_lassification:"
+#~ msgstr "Klassifikation:"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+#~ msgid "Date Completed:"
+#~ msgstr "Abgeschlossen am:"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Senden"
+#~ msgid "High"
+#~ msgstr "Hoch"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "SpДter senden"
+#, fuzzy
+#~ msgid "In Progress"
+#~ msgstr "In Bearbeitung"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "SpДter senden"
+#~ msgid "Low"
+#~ msgstr "Niedrig"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "Die Mail im HTML-Format senden"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Die Nachricht spДter senden"
+#~ msgid "Not Started"
+#~ msgstr "Nicht gestartet"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "Die Nachricht jetzt senden"
+#~ msgid "Task"
+#~ msgstr "Auftrag"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "Diese Nachricht jetzt senden"
+#~ msgid "_Contacts..."
+#~ msgstr "Kontakte..."
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "Anlagen anzeigen / verbergen"
+#~ msgid "_Due Date:"
+#~ msgstr "FДllig am:"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Anlagen anzeigen"
+#~ msgid "_Priority:"
+#~ msgstr "_PrioritДt:"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "Anlagen zeigen"
+#~ msgid "_Status:"
+#~ msgstr "Status:"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr "Diese Nachricht mit PGP signieren"
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#: po/tmp/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "Textdatei e_infЭgen... (FIXME)"
+#~ msgid "A_ll day event"
+#~ msgstr "GanztДgiges Ereignis"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_жffnen..."
+#~ msgid "Appointment Basics"
+#~ msgstr "Termin-Grundeinstellungen"
 
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr "_Sicherheit"
+#~ msgid "Custom recurrence"
+#~ msgstr "Benutzerdefinierte Wiederholung"
 
-#.
-#. * 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 "Ordner zu Ihrer Liste abonnierter Ordner hinzufЭgen"
+#~ msgid "Days"
+#~ msgstr "Tage"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Liste aktualisieren"
+#~ msgid "Every"
+#~ msgstr "Alle"
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Liste von Ordnern aktualisieren"
+#~ msgid "Exceptions"
+#~ msgstr "Ausnahmen"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
+#~ msgid "Hours"
+#~ msgstr "Stunden"
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Abonnieren"
+#~ msgid "Mail _to:"
+#~ msgstr "Mail an:"
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Abonnement kЭndigen"
+#~ msgid "Minutes"
+#~ msgstr "Minuten"
 
-#.
-#. * 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 "Einen anderen Ordner anzeigen"
+#~ msgid "Modify"
+#~ msgstr "дndern"
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "Beenden"
+#~ msgid "No recurrence"
+#~ msgstr "Keine Wiederholung"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-LeistenverknЭpfung"
+#~ msgid "Preview"
+#~ msgstr "Vorschau"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Das Programm verlassen"
+#~ msgid "Pri_vate"
+#~ msgstr "Privat"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Erste Schritte"
+#~ msgid "Pu_blic"
+#~ msgstr "жffentlich"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Information Эber Evolution anzeigen"
+#~ msgid "Recurrence"
+#~ msgstr "Wiederholung"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Die Ordnerleiste anzeigen"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Wiederholungsregel"
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Die VerknЭpfungsleiste anzeigen"
+#~ msgid "Reminder"
+#~ msgstr "Erinnerung"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "Fehlerbericht einschicken"
+#~ msgid "Simple recurrence"
+#~ msgstr "Einfache Wiederholung"
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
+#~ msgid "Su_mmary:"
+#~ msgstr "Zusammenfassung:"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Anzeige der Ordnerleiste an/aus"
+#~ msgid "Time"
+#~ msgstr "Zeit"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Anzeige der VerknЭpfungsleiste an/aus"
+#~ msgid "_Audio"
+#~ msgstr "Audio"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "Die Kontaktverwaltung benutzen"
+#~ msgid "_Confidential"
+#~ msgstr "Vertraulich"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Den Kalender benutzen"
+#~ msgid "_Contacts"
+#~ msgstr "_Kontakte"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Den _Mailer benutzen"
+#~ msgid "_Mail"
+#~ msgstr "Mail"
 
-#: po/tmp/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "эber Evolution..."
+#~ msgid "_Program"
+#~ msgstr "_Programm"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "Termin (FIXME)"
+#~ msgid "_Run program:"
+#~ msgstr "Programm ausfЭhren:"
 
-#: po/tmp/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "Kontakt (FIXME)"
+#~ msgid "_Start time:"
+#~ msgstr "Anfangszeit:"
 
-#: po/tmp/evolution.xml.h:26
-msgid "_Folder"
-msgstr "Ordner"
+#~ msgid "_Starting date:"
+#~ msgstr "Anfangsdatum:"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Gehe zu Ordner..."
+#~ msgid "day(s)"
+#~ msgstr "Tag(e)"
 
-#: po/tmp/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Index"
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "Mailnachricht (FIXME)"
+#~ msgid "for"
+#~ msgstr "fЭr"
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Settings"
-msgstr "Einstellungen"
+#~ msgid "forever"
+#~ msgstr "fЭr immer"
 
-#: po/tmp/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "Auftrag (FIXME)"
+#~ msgid "label21"
+#~ msgstr "label21"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
+#~ msgid "month(s)"
+#~ msgstr "Monat(e)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "VorlДufig"
+#~ msgid "until"
+#~ msgstr "bis"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "BeschДftigt"
+#~ msgid "week(s)"
+#~ msgstr "Woche(n)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Auъer Haus"
+#~ msgid "year(s)"
+#~ msgstr "Jahr(e)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Keine Information"
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Konnte keinen Kalender in `%s' anlegen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Andere einladen..."
+#~ msgid "Server disconnected."
+#~ msgstr "Server getrennt."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "Optionen"
+#~ msgid "Attachment properties"
+#~ msgstr "Anlagen-Eigenschaften"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Nur Arbeitszeit anzeigen"
+#~ msgid "File name:"
+#~ msgstr "Dateiname:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Weggezoomt anzeigen"
+#~ msgid "MIME type:"
+#~ msgstr "MIME-Typ:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "Frei/beschДftigt aktualisieren"
+#~ msgid "Edit VFolders"
+#~ msgstr "VOrdner bearbeiten"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "<<"
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregeln"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "AutoWahl"
+#~ msgid "Incoming"
+#~ msgstr "Eingang"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">>"
+#~ msgid "Outgoing"
+#~ msgstr "Ausgang"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "Alle Leute und Ressourcen"
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuelle Ordner"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle Leute und eine Ressource"
+#~ msgid "vFolder Sources"
+#~ msgstr "vOrdner-Quellen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "BenЖtigte Leute"
+#~ msgid "Save"
+#~ msgstr "Speichern"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "BenЖtigte Leute und eine Ressource"
+#~ msgid "Show all hidden"
+#~ msgstr "Alle versteckten anzeigen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Anfang der Besprechung:"
+#~ msgid "Hide selected"
+#~ msgstr "GewДhlte verbergen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Ende der Besprechung:"
+#~ msgid "Hide read"
+#~ msgstr "Gelesene verbergen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle Anwesenden"
+#~ msgid "Hide deleted"
+#~ msgstr "GelЖschte verbergen"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MDMDFSS"
+#~ msgid "Hide Subject"
+#~ msgstr "Betreff verbergen"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Hide Messages"
+#~ msgstr "Nachrichten verbergen"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Betreff \"%s\" verbergen"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Jetzt"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Sie haben keine Mailquellen konfiguriert"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H.%M"
+#~ msgid "Account"
+#~ msgstr "Account"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Account Information"
+#~ msgstr "Account-Information"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
+#~ msgid "Account Properties"
+#~ msgstr "Account-Eigenschaften"
+
+#~ msgid "Advanced"
+#~ msgstr "Komplex"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentikation"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Authentikations-Typ:"
+
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "GlЭckwunsch! Ihre Mailkonfiguration ist abgeschlossen.\n"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#, fuzzy
+#~ msgid "using Evolution. \n"
+#~ msgstr "beim der Nutzung von Evolution. \n"
+
+#~ msgid "Click \"Finish\" to save your settings."
+#~ msgstr "Klicken Sie \"Beenden\" um Ihre Einstellungen zu speichern."
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-Mail Adresse:"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-Mail Adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution-Mailkonfiguration"
+
+#~ msgid "Full Name:"
+#~ msgstr "Voller Name:"
+
+#~ msgid "Hostname:"
+#~ msgstr "Hostname:"
+
+#~ msgid "Identity"
+#~ msgstr "IdentitДt"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "Mail"
+
+#~ msgid "Mail Account"
+#~ msgstr "Mail-Account"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Mailkonfiguration"
+
+#~ 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 "Organization:"
+#~ msgstr "Organisation:"
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Mail erhalten"
+
+#~ msgid "Remember my password"
+#~ msgstr "Passwort speichern"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Antwort an:"
+
+#~ msgid "Required"
+#~ msgstr "BenЖtigt"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Passwort speichern"
+
+#~ msgid "Select signature file"
+#~ msgstr "Signaturdatei wДhlen"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sende E-Mail"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server-Konfiguration"
+
+#~ msgid "Server Type: "
+#~ msgstr "Servertyp: "
+
+#~ msgid "Servers"
+#~ msgstr "Server"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturdatei:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Sources"
+#~ msgstr "Quellen"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Dieser Server benЖtigt eine sichere Verbindung (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "User Information"
+#~ msgstr "Benutzer-Information"
+
+#~ msgid "Username:"
+#~ msgstr "Benutzername:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden!\n"
+
+#~ msgid "Click \"Next\" to begin. "
+#~ msgstr "Klicken Sie \"Weiter\" um zu beginnen."
+
+#~ 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 ""
+#~ "Geben Sie den Namen und die E-Mail-Adresse zur Verwendung in Ihrer "
+#~ "ausgehenden Mail ein. Sie kЖnnen auf Wunsch auch den Namen Ihrer "
+#~ "Organisation erwДhnen, und den einer Datei, in der Ihre Signatur steht."
+
+#~ msgid "Full name:"
+#~ msgstr "Voller Name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-Mail-Adresse:"
+
+#~ msgid "Signature File"
+#~ msgstr "Signaturdatei"
+
+#~ msgid "Server:"
+#~ msgstr "Server:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "UnterstЭtzte Typen feststellen..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Nachrichten nicht vom Server lЖschen"
+
+#~ msgid "Test Settings"
+#~ msgstr "Einstellungen testen"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Mailquellen-Typ:"
+
+#~ 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 ""
+#~ "WДhlen Sie, welche Art von Mailserver Sie haben, und geben Sie die relevante "
+#~ "Information dazu ein.\n"
+#~ "\n"
+#~ "Wenn der Server Authentikation erfordert, kЖnnen Sie auf \"UnterstЭtzte "
+#~ "Typen feststellen...\" klicken, bevor Sie andere Informationen eingeben."
+
+#~ msgid "News source type:"
+#~ msgstr "Newsquellen-Typ:"
+
+#~ 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 ""
+#~ "WДhlen Sie, welche Art von Newsserver Sie haben, und geben Sie die relevante "
+#~ "Information dazu ein.\n"
+#~ "\n"
+#~ "Wenn der Server Authentikation erfordert, kЖnnen Sie auf \"UnterstЭtzte "
+#~ "Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
+#~ "eingegeben haben."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Mailtransport-Typ:"
+
+#~ msgid "Add Identity"
+#~ msgstr "IdentitДt hinzufЭgen"
+
+#~ msgid "Edit Identity"
+#~ msgstr "IdentitДt bearbeiten"
+
+#~ msgid "Add Source"
+#~ msgstr "Quelle hinzufЭgen"
+
+#~ msgid "Edit Source"
+#~ msgstr "Quelle bearbeiten"
+
+#~ msgid "Add News Server"
+#~ msgstr "Newsserver hinzufЭgen"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Newsserver bearbeiten"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Teste \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Die Verbindung war erfolgreich!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Ermittle AutorisationsfДhigkeiten von \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Ermittle Autorisation auf \"%s\""
 
-#~ msgid "categories"
-#~ msgstr "Kategorien"
+#~ msgid "Address"
+#~ msgstr "Adresse"
+
+#~ msgid "Identities"
+#~ msgstr "IdentitДten"
+
+#~ msgid "Mail Sources"
+#~ msgstr "Mailquellen"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Mailtransport"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Nachrichten als gesehen markieren [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "Newsserver"
+
+#~ msgid "News Sources"
+#~ msgstr "Newsquellen"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Nachrichten in HTML-Format senden"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr ""
+#~ "Keine GPG-/PGP-UnterstЭtzung in diesem Exemplar von Evolution verfЭgbar."
+
+#~ msgid "Create a new contact"
+#~ msgstr "Einen neuen Kontakt anlegen"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Einen Kontakt lЖschen"
+
+#~ msgid "Find"
+#~ msgstr "Suchen"
+
+#~ msgid "Find a contact"
+#~ msgstr "Einen Kontakt suchen"
+
+#~ msgid "Print contacts"
+#~ msgstr "Kontakte drucken"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Laden abbrechen"
+
+#~ msgid "View All"
+#~ msgstr "Alle betrachten"
+
+#~ msgid "View all contacts"
+#~ msgstr "Alle Kontakte betrachten"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_Addressbuckkonfiguration..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Kontakte drucken..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "Nach Kontakten _suchen"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Tage"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Einstellungen Дndern"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Kalender-Einstellungen..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Einen neuen Termin anlegen"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Einen neuen Kalender anlegen"
+
+#~ msgid "Day"
+#~ msgstr "Tag"
+
+#~ msgid "Go back in time"
+#~ msgstr "In der Zeit zurЭckgehen"
+
+#~ msgid "Go forward in time"
+#~ msgstr "In der Zeit vorangehen"
+
+#~ msgid "Go to"
+#~ msgstr "Gehe zu"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Zu bestimmtem Datum gehen"
+
+#~ msgid "Go to present time"
+#~ msgstr "Zur aktuellen Zeit gehen"
+
+#~ msgid "Month"
+#~ msgstr "Monat"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Einen Kalender Жffnen"
+
+#~ msgid "Prev"
+#~ msgstr "ZurЭck"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Diesen Kalender drucken"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Kalender als etwas anderes speichern"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Einen Tag zeigen"
+
+#~ msgid "Show 1 month"
+#~ msgstr "1 Monat zeigen"
+
+#~ msgid "Show 1 week"
+#~ msgstr "1 Woche zeigen"
+
+#~ msgid "Show the working week"
+#~ msgstr "Die Arbeitswoche zeigen"
+
+#~ msgid "Week"
+#~ msgstr "Woche"
+
+#~ msgid "_New"
+#~ msgstr "_Neu"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Kalender Жffnen"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Diesen Kalender drucken"
+
+#~ msgid "_Save As..."
+#~ msgstr "Speichern _unter..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Diesen Eintrag lЖschen"
+
+#~ msgid "Delete..."
+#~ msgstr "LЖschen..."
+
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Umschlag drucken..."
+
+#~ msgid "Print this item"
+#~ msgstr "Diesen Eintrag drucken"
+
+#~ msgid "Print..."
+#~ msgstr "Drucken..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Speichern _unter..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Speichern und schlieъen"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Den Kontakt speichern und das Dialogfenster schlieъen"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Kontakt an anderen senden..."
+
+#~ msgid "See online help"
+#~ msgstr "Online-Hilfe einsehen"
+
+#~ msgid "_File"
+#~ msgstr "_Datei"
+
+#~ msgid "_Print..."
+#~ msgstr "_Drucken..."
+
+#~ msgid "_Save"
+#~ msgstr "_Speichern"
+
+#~ msgid "About this application"
+#~ msgstr "эber diese Anwendung"
+
+#~ msgid "About..."
+#~ msgstr "Info..."
+
+#~ msgid "C_lear"
+#~ msgstr "_LЖschen"
+
+#~ msgid "C_ut"
+#~ msgstr "Ausschneiden"
+
+#~ msgid "Clear"
+#~ msgstr "LЖschen"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Die Auswahl lЖschen"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Diesen Termin abschlieъen"
+
+#~ msgid "Copy"
+#~ msgstr "Kopieren"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Die Auswahl kopieren"
+
+#~ msgid "Cut"
+#~ msgstr "Ausschneiden"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Die Auswahl ausschneiden"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML auswerfen"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Die XML-UI-Beschreibung auswerfen"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Adress_buch..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Namen prЭfen"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Hilfe"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: UnvollstДndige Aufgabe"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Datei einfЭgen"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Wiederholung..."
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "FIXME: was kommt hierher?"
+
+#~ msgid "Find Again"
+#~ msgstr "Weitersuchen"
+
+#~ msgid "Find _Again"
+#~ msgstr "Weitersuchen"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Eigenschaften der Datei Дndern"
+
+#~ msgid "N_ext"
+#~ msgstr "Weiter"
+
+#~ msgid "Paste"
+#~ msgstr "EinfЭgen"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Inhalt der Zwischenablage einfЭgen"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Druckeinstellungen..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Druckeinstellungen"
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Redo"
+#~ msgstr "Wiederherstellen"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Die rЭckgДngig gemachte Aktion wiederherstellen"
+
+#~ msgid "Replace"
+#~ msgstr "Ersetzen"
+
+#~ msgid "Replace a string"
+#~ msgstr "Eine Zeichenkette ersetzen"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Den Termin speichern und das Dialogfenster schlieъen"
+
+#~ msgid "Save the current file"
+#~ msgstr "Die aktuelle Datei speichern"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Besprechung ansetzen"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Besprechung ansetzen"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Eine Besprechung ansetzen"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Noch einmal nach derselben Zeichenkette suchen"
+
+#~ msgid "Search for a string"
+#~ msgstr "Eine Zeichenkette suchen"
+
+#~ msgid "Select All"
+#~ msgstr "Alle auswДhlen"
+
+#~ msgid "Select everything"
+#~ msgstr "Alles auswДhlen"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Die Seiteneinstellungen fЭr Ihren aktuellen Drucker einrichten"
+
+#~ msgid "Undo"
+#~ msgstr "RЭckgДngig"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Die letzte Aktion rЭckgДngig machen"
+
+#~ msgid "_About..."
+#~ msgstr "Info..."
+
+#~ msgid "_Close"
+#~ msgstr "Schlieъen"
+
+#~ msgid "_Copy"
+#~ msgstr "Kopieren"
+
+#~ msgid "_Debug"
+#~ msgstr "_Diagnose"
+
+#~ msgid "_Edit"
+#~ msgstr "_Bearbeiten"
+
+#~ msgid "_Find..."
+#~ msgstr "Suchen..."
+
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
+
+#~ msgid "_Paste"
+#~ msgstr "EinfЭgen"
+
+#~ msgid "_Print"
+#~ msgstr "Drucken"
+
+#~ msgid "_Properties..."
+#~ msgstr "Eigenschaften..."
+
+#~ msgid "_Redo"
+#~ msgstr "Wiederherstellen"
+
+#~ msgid "_Replace..."
+#~ msgstr "Ersetzen..."
+
+#~ msgid "_Undo"
+#~ msgstr "RЭckgДngig"
+
+#~ msgid "Compose"
+#~ msgstr "Erstellen"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Eine neue Nachricht erstellen"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Die Nachricht in einen neuen Ordner kopieren"
+
+#~ msgid "F_older"
+#~ msgstr "Ordner"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filter Эber Absender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filter Эber EmpfДnger"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "PasswЖrter vergessen"
+
+#~ msgid "Get Mail"
+#~ msgstr "Mail abrufen"
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Ge_lЖschte Nachrichten verbergen"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "_Gelesene Nachrichten verbergen"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Die gewДhlte Nachrichten _verbergen"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "Mail-_Filter..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Abonnements verwalten..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Als gelesen markieren"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Als ungelesen markieren"
+
+#~ msgid "Move"
+#~ msgstr "Verschieben"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Die Nachricht in einen neuen Ordner verschieben"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Druckvorschau der Nachricht..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Nachricht auf dem Drucker drucken"
+
+#~ msgid "Print message..."
+#~ msgstr "Nachricht drucken..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "_Allen antworten"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Antwort an Absender"
+
+#~ msgid "Select _All"
+#~ msgstr "Alle auswДhlen"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Mail in der Warteschlange senden und neue Mail abholen"
+
+#~ msgid "Show _All messages"
+#~ msgstr "_Alle Nachrichten anzeigen"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Nachrichtenliste in StrДnge geordnet"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VOrdner Эber Absender"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VOrdner Эber EmpfДnger"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Nachrichtenquellcode anzeigen"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Filter _anwenden"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "In Ordner kopieren..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "Nachricht bearbeiten"
+
+#~ msgid "_Expunge"
+#~ msgstr "SДubern"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "Filter Эber Betreffzeile"
+
+#~ msgid "_Forward"
+#~ msgstr "Weiterleiten"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Auswahl umkehren"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mailkonfiguration..."
+
+#~ msgid "_Message"
+#~ msgstr "Nachricht"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "In Ordner verschieben..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "In neuem Fenster Жffnen"
+
+#~ msgid "_Print Message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Nachricht _Speichern unter..."
+
+#~ msgid "_Source"
+#~ msgstr "_Quelle"
+
+#~ msgid "_Threaded"
+#~ msgstr "In S_trДngen"
+
+#~ msgid "_Undelete"
+#~ msgstr "LЖschen rЭckgДngig"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "VOrdner Эber Betreffzeile"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Editor fЭr _virtuelle Ordner..."
+
+#~ msgid "Attach"
+#~ msgstr "Beilegen"
+
+#~ msgid "Close the current file"
+#~ msgstr "Die aktuelle Datei schlieъen"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Diese Nachricht mit PGP verschlЭsseln"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Eine Datei als Text in die Nachricht einfЭgen"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Textdatei einfЭgen..."
+
+#~ msgid "Open a file"
+#~ msgstr "Eine Datei Жffnen"
+
+#~ msgid "Save As"
+#~ msgstr "Speichern _unter"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "In Ordner speichern... (FIXME)"
+
+#~ msgid "Save in folder..."
+#~ msgstr "In Ordner speichern..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Die aktuelle Datei unter anderem Namen speichern"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+
+#~ msgid "Send"
+#~ msgstr "Senden"
+
+#~ msgid "Send _Later"
+#~ msgstr "SpДter senden"
+
+#~ msgid "Send _later"
+#~ msgstr "SpДter senden"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Die Mail im HTML-Format senden"
+
+#~ msgid "Send the message later"
+#~ msgstr "Die Nachricht spДter senden"
+
+#~ msgid "Send the message now"
+#~ msgstr "Die Nachricht jetzt senden"
+
+#~ msgid "Send this message now"
+#~ msgstr "Diese Nachricht jetzt senden"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Anlagen anzeigen / verbergen"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Anlagen anzeigen"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Diese Nachricht mit PGP signieren"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Textdatei e_infЭgen... (FIXME)"
+
+#~ msgid "_Open..."
+#~ msgstr "_жffnen..."
+
+#~ msgid "_Security"
+#~ msgstr "_Sicherheit"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufЭgen"
+
+#~ msgid "Refresh List"
+#~ msgstr "Liste aktualisieren"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Liste von Ordnern aktualisieren"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonnieren"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Abonnement kЭndigen"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Einen anderen Ordner anzeigen"
+
+#~ msgid "E_xit"
+#~ msgstr "Beenden"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution-LeistenverknЭpfung"
+
+#~ msgid "Exit the program"
+#~ msgstr "Das Programm verlassen"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Erste Schritte"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Information Эber Evolution anzeigen"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Die Ordnerleiste anzeigen"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Fehlerbericht einschicken"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Anzeige der Ordnerleiste an/aus"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Anzeige der VerknЭpfungsleiste an/aus"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Die Kontaktverwaltung benutzen"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Den Kalender benutzen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Den _Mailer benutzen"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "эber Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Termin (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Kontakt (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "Ordner"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Gehe zu Ordner..."
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "Mailnachricht (FIXME)"
+
+#~ msgid "_Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Auftrag (FIXME)"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Eintrag/EintrДge gehЖrt/gehЖren zu diesen Kategorien:"
@@ -7079,9 +6925,6 @@ msgstr "Gruppe %i"
 #~ msgid "ago"
 #~ msgstr "her"
 
-#~ msgid "Reminder of your appointment at "
-#~ msgstr "Erinnerung an Ihren Termin am "
-
 #~ msgid "Year:"
 #~ msgstr "Jahr:"
 
@@ -7304,9 +7147,6 @@ msgstr "Gruppe %i"
 #~ msgid "Preferences"
 #~ msgstr "Einstellungen"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarme"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Alarm-Eigenschaften"
 
@@ -7328,13 +7168,6 @@ msgstr "Gruppe %i"
 #~ 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"
 
@@ -7359,9 +7192,6 @@ msgstr "Gruppe %i"
 #~ msgid "Draft"
 #~ msgstr "Entwurf"
 
-#~ msgid "Flagged"
-#~ msgstr "Markiert"
-
 #~ msgid "Set Flag"
 #~ msgstr "Marke setzen"
 
@@ -7371,10 +7201,6 @@ msgstr "Gruppe %i"
 #~ 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."
 
@@ -7476,8 +7302,5 @@ msgstr "Gruppe %i"
 #~ 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 ed816c73e0..da96440530 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Spiros Papadimitriou <spapadim+@cs.cmu.edu>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,197 +14,366 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#, fuzzy
+msgid "Could not initialize Bonobo"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "аПОСТОКч"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, c-format
+msgid "Close %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_мщОР жэЙЕККОР"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr ""
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "New"
+msgstr "_мщО"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -220,30 +389,18 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-#, fuzzy
-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.
@@ -362,42 +519,33 @@ msgstr ""
 "пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream АПЭ "
 "ТГ ЛОМэДА"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-#, fuzzy
-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.
@@ -407,7 +555,7 @@ msgid "_Add"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr ""
 
@@ -420,14 +568,7 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -489,7 +630,6 @@ msgid "C_ontacts..."
 msgstr "_цМЫЯИЛъА"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -508,8 +648,6 @@ msgid "_Address..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr ""
 
@@ -555,24 +693,27 @@ msgid "No_tes:"
 msgstr "сГЛЕъЫ_ЛА"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -581,6 +722,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr ""
 
@@ -591,32 +733,37 @@ msgstr "аМТИЦЯАЖч"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 #, fuzzy
 msgid "Home"
 msgstr "сГЛЕъЫ_ЛА"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 #, fuzzy
 msgid "Home 2"
 msgstr "сГЛЕъЫ_ЛА"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 #, fuzzy
 msgid "Home Fax"
 msgstr "сГЛЕъЫ_ЛА"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 #, fuzzy
 msgid "Mobile"
 msgstr "_лчМУЛА"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr ""
 
@@ -625,11 +772,13 @@ msgid "Other Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Pager"
 msgstr "еПИЙЭККГСГ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 #, fuzzy
 msgid "Primary"
 msgstr "пЯОТЕЯАИЭТГТА"
@@ -647,62 +796,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/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.
@@ -757,12 +860,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -788,30 +886,30 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
@@ -840,9 +938,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr ""
 
@@ -877,12 +975,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr ""
 
@@ -900,12 +996,10 @@ msgid "Search Scope:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 #, fuzzy
 msgid "Path:"
 msgstr "еПИЙЭККГСГ"
@@ -931,386 +1025,94 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Find..."
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
-msgid "Message Recipients"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "Select Names"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-#, fuzzy
-msgid "o"
-msgstr "пЯОР"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
-#, fuzzy
-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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "Body"
-msgstr "счЛЕЯА"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr ""
+msgid "Email"
+msgstr "_лчМУЛА"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "Fonts"
-msgstr "цМЫЯИЛъЕР"
+msgid "Department"
+msgstr "еПИЙЭККГСГ"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 #, fuzzy
-msgid "Format"
-msgstr "аПЭ"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr ""
+msgid "Title"
+msgstr "_жэЙЕККОР"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 #, fuzzy
-msgid "Options"
+msgid "Profession"
 msgstr "е_МщЯЦЕИЕР"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:30
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 #, fuzzy
-msgid "Page"
+msgid "Manager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 #, fuzzy
-msgid "Paper"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:34
-#, fuzzy
-msgid "Portrait"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:39
-#, fuzzy
-msgid "Sections:"
-msgstr "е_МщЯЦЕИЕР"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr ""
+msgid "Spouse"
+msgstr "мщА сУМТЭЛЕУСГ"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 #, fuzzy
-msgid "Size:"
-msgstr "лщЦЕХОР"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr ""
+msgid "Note"
+msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: addressbook/gui/widgets/e-minicard-control.c:280
 #, fuzzy
-msgid "Top:"
-msgstr "пЯОР:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr ""
+msgid "Save in addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
+#: addressbook/gui/widgets/e-minicard-view.c:129
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
 msgstr ""
 
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
@@ -1322,13 +1124,13 @@ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1341,72 +1143,17 @@ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "гЛЕЯОКЭЦИО"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 #, fuzzy
 msgid "Snooze"
 msgstr "лщЦЕХОР"
@@ -1417,27 +1164,27 @@ msgstr "лщЦЕХОР"
 msgid "Ok"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 #, fuzzy
 msgid "Open calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 #, fuzzy
 msgid "Save calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1445,61 +1192,58 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 #, fuzzy
 msgid "Private"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1508,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1516,890 +1260,435 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:224
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: calendar/gui/control-factory.c:125
-#, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
-
-#: 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
+#: calendar/gui/calendar-summary.c:484
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/calendar-summary.c:489
 #, fuzzy
-msgid "Edit appointment"
+msgid "Show appointments"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/calendar-summary.c:497
 #, fuzzy
-msgid "Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-#, fuzzy
-msgid "Friday"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-#, fuzzy
-msgid "Monday"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-#, fuzzy
-msgid "Saturday"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "Show appointment end times"
-msgstr "я_АМТЕБОЩ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-#, fuzzy
-msgid "Sunday"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#, fuzzy
-msgid "TaskPad"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
+msgid "Show tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
-msgid "Thursday"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
+msgid "Loading Calendar"
+msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
+#: calendar/gui/control-factory.c:127
 #, fuzzy
-msgid "Tuesday"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
+msgid "The URI that the calendar will display"
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#, fuzzy
-msgid "seconds."
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "еЙЙЯЕЛЭТГТЕР"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
-msgid "None"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "End Date"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
-msgid "Normal"
-msgstr "аПЭ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr ""
+msgid "Start Date"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#, fuzzy
-msgid "Task"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Contacts..."
-msgstr "_цМЫЯИЛъА"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#, fuzzy
-msgid "_Priority:"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "я_АМТЕБОЩ"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "еЙЙЯЕЛЭТГТЕР"
-
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
-
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:166
+#, fuzzy
+msgid "Alarms"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Open..."
 msgstr "╤МОИ_ЦЛА"
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Delete the task"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 #, fuzzy
 msgid "New appointment..."
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor.c:331
 #, fuzzy
-msgid "Days"
-msgstr "пЯЭВЕИЯА"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
+msgid "Edit Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:409
 #, fuzzy
-msgid "Exceptions"
-msgstr "е_МщЯЦЕИЕР"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr ""
+msgid "on"
+msgstr "пЯОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor.c:435
 #, fuzzy
-msgid "Modify"
+msgid "Monday"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#, fuzzy
-msgid "Pri_vate"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor.c:436
 #, fuzzy
-msgid "_End time:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-#, fuzzy
-msgid "_Mail"
-msgstr "_лчМУЛА"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr ""
+msgid "Tuesday"
+msgstr "счЛЕЯА"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor.c:438
 #, fuzzy
-msgid "_Start time:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr ""
+msgid "Thursday"
+msgstr "счЛЕЯА"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor.c:439
 #, fuzzy
-msgid "month(s)"
-msgstr "цМЫЯИЛъЕР"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr ""
+msgid "Friday"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:440
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Saturday"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:441
 #, fuzzy
-msgid "on"
-msgstr "пЯОР"
-
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
+msgid "Sunday"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr ""
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:15
-msgid "March"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:18
-msgid "October"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
 msgstr ""
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
@@ -2595,10 +1884,15 @@ msgstr ""
 msgid "Print Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr ""
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2689,78 +1983,85 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2776,40 +2077,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2821,25 +2123,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2847,13 +2149,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, 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)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2861,7 +2163,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2869,7 +2171,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3191,8 +2493,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3221,71 +2523,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "аПОСТОКч"
@@ -3334,130 +2635,123 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3501,12 +2795,11 @@ msgid "attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "еПИСЩМАЬГ АЯВЕъОУ"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "дИАЦЯАЖч"
 
@@ -3522,59 +2815,42 @@ msgstr "мщА ЕПИСЩМАЬГ..."
 msgid "Attach a file to the message"
 msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-#, fuzzy
-msgid "Attachment properties"
-msgstr "еПИСЩМАЬГ"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 #, fuzzy
 msgid "From:"
 msgstr "аПЭ"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "пЯОР:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "аМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3582,11 +2858,11 @@ msgstr ""
 "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР ВЫЯъР АУТщР "
 "МА ЕЛЖАМИСТОЩМ СТОМ ЙАТэКОЦО ПАЯАКГПТЧМ ТОУ ЛГМЩЛАТОР."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "хщЛА:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "еИСэЦЕТЕ ТО ХщЛА ТОУ ЛГМЩЛАТОР"
 
@@ -3597,95 +2873,91 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 #, fuzzy
 msgid "Open file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 #, fuzzy
 msgid "Compose a message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
@@ -3817,7 +3089,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 #, fuzzy
 msgid "Edit Filters"
 msgstr "_жэЙЕККОР"
@@ -3922,205 +3194,182 @@ msgstr ""
 msgid "Read"
 msgstr "дИАЦЯАЖч"
 
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid "Edit VFolders"
-msgstr "_жэЙЕККОР"
-
-#: filter/filter.glade.h:11
-#, fuzzy
-msgid "Filter Rules"
-msgstr "_жэЙЕККОР"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-#, fuzzy
-msgid "Virtual Folders"
-msgstr "_жэЙЕККОР"
-
-#: filter/filter.glade.h:16
-#, fuzzy
-msgid "vFolder Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "after"
-msgstr "еПИЙЭККГСГ"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "contains"
-msgstr "е_МщЯЦЕИЕР"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Date received"
 msgstr "еКчЖХГ"
 
-#: filter/libfilter-i18n.h:9
+#: 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
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr ""
+#, fuzzy
+msgid "Message was sent"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Expression"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Sender"
+msgstr "аПОСТОКч"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Forward to Address"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Set Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "мщА сУМТЭЛЕУСГ"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Message Body"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "хщЛА"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "Message Header"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "after"
+msgstr "еПИЙЭККГСГ"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "Message was sent"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "contains"
+msgstr "е_МщЯЦЕИЕР"
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "Move to Folder"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "Sender"
-msgstr "аПОСТОКч"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Source"
-msgstr "мщА сУМТЭЛЕУСГ"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "хщЛА"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4139,10 +3388,6 @@ msgstr "мщА сУМТЭЛЕУСГ"
 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 ""
@@ -4152,218 +3397,172 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr "_жэЙЕККОР"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr ""
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "_мщОР жэЙЕККОР"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 #, fuzzy
 msgid "Subject contains"
 msgstr "хщЛА"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr ""
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr ""
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "хщЛА"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "╤МОИ_ЦЛА"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr ""
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 #, fuzzy
 msgid "Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Create Rule From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "хщЛА"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
-
-#: mail/local-config.glade.h:7
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "аПЭ"
+msgid "None"
+msgstr "сГЛЕъЫ_ЛА"
 
-#: mail/local-config.glade.h:8
-msgid "New store format:"
+#: mail/mail-accounts.c:115
+msgid " (default)"
 msgstr ""
 
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:11
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mbox"
-msgstr "еИСЕЯВЭЛЕМА"
-
-#: mail/local-config.glade.h:12
-msgid "mh"
-msgstr ""
+msgid "Evolution Account Editor"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4385,7 +3584,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4393,527 +3592,114 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "еПИСЩМАЬГ"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Default"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:26
-msgid "Delete mail from server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "E-Mail Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Email Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_лчМУЛА"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "лИЙЯэ еИЙОМъДИА"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "_мщО"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "е_МщЯЦЕИЕР"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:57
-msgid "Reply-to:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Select signature file"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "аПОСТОКч"
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Server Type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "аПОСТОКч"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Signature:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-msgid "User Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "цМЫЯИЛъЕР"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr ""
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr ""
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr ""
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr ""
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-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
-#, fuzzy
-msgid "Mail source type:"
-msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
-
-#: mail/mail-config-gui.c:1135
-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: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"
-"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:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1333
-#, fuzzy
-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
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr ""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr ""
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Mail Sources"
-msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr ""
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "News Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr ""
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr ""
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -4949,66 +3735,66 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5067,7 +3853,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5092,160 +3878,160 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 #, fuzzy
 msgid "Copying"
 msgstr "аМТИЦЯАЖч"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5256,7 +4042,7 @@ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5361,117 +4147,194 @@ msgstr "_мщОР жэЙЕККОР"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 #, fuzzy
 msgid "Forward this message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 #, fuzzy
 msgid "Print the selected message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 #, fuzzy
 msgid "Delete this message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 #, fuzzy
 msgid "Seen"
 msgstr "аПОСТОКч"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "мЕА ЕПИСЩМАЬГ"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "аПЭ"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "еПИЙЭККГСГ"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "еКчЖХГ"
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "пЯОР"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "лщЦЕХОР"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "_жэЙЕККОР"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5564,30 +4427,30 @@ msgstr ""
 msgid "New..."
 msgstr "_мщО"
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 #, fuzzy
 msgid "Go to folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
@@ -5596,14 +4459,19 @@ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 #, fuzzy
 msgid "Folders"
 msgstr "_жэЙЕККОР"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
+#, c-format
+msgid "%s - Evolution %s"
+msgstr ""
+
+#: shell/e-shell-view.c:1100
 #, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s [%s]"
 msgstr ""
 
 #: shell/e-shell.c:372
@@ -5611,78 +4479,88 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 #, fuzzy
 msgid "_Small Icons"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Large Icons"
 msgstr "лЕЦэКА еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 #, fuzzy
 msgid "_New Group..."
 msgstr "мщА оЛэДА"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 #, fuzzy
 msgid "_Remove This Group..."
 msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5691,13 +4569,12 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "_View"
 msgstr "_мщО"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "View the selected folder"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
@@ -5791,1326 +4668,1021 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr ""
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-contact-editor.xml:8
 #, fuzzy
-msgid "Delete a contact"
-msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+msgid "FIXME: Meeting Re_quest"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr ""
+#: ui/evolution-contact-editor.xml:10
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "_лчМУЛА"
+
+#: ui/evolution-contact-editor.xml:11
+#, fuzzy
+msgid "FIXME: _Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: ui/evolution-contact-editor.xml:13
 #, fuzzy
-msgid "New"
-msgstr "_мщО"
+msgid "FIXME: Task _Request"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-contact-editor.xml:14
 #, fuzzy
-msgid "Print contacts"
-msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+msgid "FIXME: _Journal Entry"
+msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "View all contacts"
-msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+msgid "FIXME: Define Print _Styles..."
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: ui/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-contact-editor.xml:35
 #, fuzzy
-msgid "_Print Contacts..."
-msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "е_ЯЦАКЕъА"
+msgid "FIXME: Save Attac_hments..."
+msgstr "мщА ЕПИСЩМАЬГ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:41
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr ""
+msgid "Page Set_up"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
+#: ui/evolution-contact-editor.xml:63
+msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr ""
+#: ui/evolution-contact-editor.xml:72
+#, fuzzy
+msgid "_Object"
+msgstr "хщЛА"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
-#, fuzzy
-msgid "Month"
-msgstr "цМЫЯИЛъЕР"
-
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-contact-editor.xml:93
 #, fuzzy
-msgid "Open a calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+msgid "FIXME: __Formatting"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Print this calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr ""
+#: ui/evolution-contact-editor.xml:104
+#, fuzzy
+msgid "_Toolbars"
+msgstr "е_ЯЦАКЕъА"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-#, fuzzy
-msgid "Today"
-msgstr "счЛЕЯА"
-
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_мщО"
-
-#: ui/evolution-calendar.xml.h:33
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
-msgid "_Print this calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
-
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: ui/evolution-contact-editor.xml.h:7
-#, fuzzy
-msgid "Delete this item"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: ui/evolution-contact-editor.xml.h:8
-msgid "Delete..."
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Print En_velope..."
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-#, fuzzy
-msgid "Print..."
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-#, fuzzy
-msgid "Save _As..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml:137
 #, fuzzy
-msgid "_File"
-msgstr "_жэЙЕККОР"
+msgid "_Forms"
+msgstr "аПЭ"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml:142
 #, fuzzy
-msgid "_Print..."
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "FIXME: _New Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:147
 #, fuzzy
-msgid "Actio_ns"
-msgstr "е_МщЯЦЕИЕР"
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:9
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "C_lear"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:10
+#: ui/evolution-contact-editor.xml:149
 #, fuzzy
-msgid "C_ut"
-msgstr "йОПч"
+msgid "FIXME: New _Task for Contact"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr ""
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14
+#: ui/evolution-contact-editor.xml:153
 #, fuzzy
-msgid "Close this appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "аМТИЦЯАЖч"
-
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+msgid "FIXME: _Display Map of Address"
+msgstr "_лчМУЛА"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "йОПч"
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "_лчМУЛА"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:170
+#, fuzzy
+msgid "F_ormat"
+msgstr "аПЭ"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "е_ЯЦАКЕъА"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
+#: ui/evolution-contact-editor.xml:172
+#, fuzzy
+msgid "Actio_ns"
+msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28
+#: ui/evolution-contact-editor.xml:249
 #, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+msgid "FIXME: Next"
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
+#. 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:2471
+msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#, fuzzy
+msgid "_Options"
+msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "мщА ЕПИСЩМАЬГ..."
-
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#: ui/evolution-event-editor.xml.h:46
-#, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50
-#, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
-
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+msgid "Meeting _start time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: ui/evolution-event-editor.xml.h:54
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_лчМУЛА"
+msgid "Meeting _end time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "я_АМТЕБОЩ"
-
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+#, fuzzy
+msgid "Now"
+msgstr "_мщО"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:413
+#, fuzzy
+msgid "Today"
+msgstr "счЛЕЯА"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 #, fuzzy
-msgid "F_ormat"
-msgstr "аПЭ"
+#~ msgid "Delete Contact?"
+#~ msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr ""
+#, fuzzy
+#~ msgid "Find..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr ""
+#, fuzzy
+#~ msgid "Message Recipients"
+#~ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr ""
+#, fuzzy
+#~ msgid "Select Names"
+#~ msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr ""
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "еПИЙЭККГСГ"
+#, fuzzy
+#~ msgid "o"
+#~ msgstr "пЯОР"
 
-#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+#~ msgid "Body"
+#~ msgstr "счЛЕЯА"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr ""
+#, fuzzy
+#~ msgid "Fonts"
+#~ msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr ""
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "аПЭ"
 
-#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "пЯОТЕЯАИЭТГТА"
+#~ msgid "Options"
+#~ msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "пЯОТЕЯАИЭТГТА"
+#~ msgid "Page"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "иДИЭТГТЕР"
+#~ msgid "Paper"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "дИАЦЯАЖч"
+#~ msgid "Portrait"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
+#, fuzzy
+#~ msgid "Sections:"
+#~ msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "еКчЖХГ"
+#~ msgid "Size:"
+#~ msgstr "лщЦЕХОР"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Top:"
+#~ msgstr "пЯОР:"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
+#, fuzzy
+#~ msgid "Calendar Server"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit appointment"
+#~ msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#, fuzzy
+#~ msgid "seconds."
+#~ msgstr "аПОСТОКч"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr ""
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "аПЭ"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#, fuzzy
+#~ msgid "_Contacts..."
+#~ msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "аЙЩЯЫСГ"
+#, fuzzy
+#~ msgid "_Priority:"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-event-editor.xml.h:103
 #, fuzzy
-msgid "Undo the last action"
-msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
+#~ msgid "Appointment Basics"
+#~ msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr ""
+#, fuzzy
+#~ msgid "Days"
+#~ msgstr "пЯЭВЕИЯА"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr ""
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "аМТИЦЯАЖч"
+#~ msgid "Modify"
+#~ msgstr "счЛЕЯА"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#, fuzzy
+#~ msgid "Pri_vate"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr ""
+#, fuzzy
+#~ msgid "_Mail"
+#~ msgstr "_лчМУЛА"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "пЯОТЕЯАИЭТГТА"
+#~ msgid "month(s)"
+#~ msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
-msgid "_Forms"
-msgstr "аПЭ"
+#~ msgid "April"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
 #, fuzzy
-msgid "_Help"
-msgstr "сГЛЕъЫ_ЛА"
+#~ msgid "Go To Today"
+#~ msgstr "счЛЕЯА"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr ""
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "счЛЕЯА"
 
-#: ui/evolution-event-editor.xml.h:115
 #, fuzzy
-msgid "_Object"
-msgstr "хщЛА"
+#~ msgid "Attachment properties"
+#~ msgstr "еПИСЩМАЬГ"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "еПИЙЭККГСГ"
+#~ msgid "Edit VFolders"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "пЯОТЕЯАИЭТГТА"
+#~ msgid "Filter Rules"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "иДИЭТГТЕР"
+#~ msgid "Virtual Folders"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
+#, fuzzy
+#~ msgid "vFolder Sources"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "хщЛА"
 
-#: ui/evolution-event-editor.xml.h:122
 #, fuzzy
-msgid "_Toolbars"
-msgstr "е_ЯЦАКЕъА"
+#~ msgid "Hide Messages"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
-msgid "_Undo"
-msgstr "аЙЩЯЫСГ"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "хщЛА"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr ""
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: ui/evolution-mail.xml.h:7
 #, fuzzy
-msgid "Compose a new message"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+#~ msgid "Mailbox Format"
+#~ msgstr "аПЭ"
 
-#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+#~ msgid "mbox"
+#~ msgstr "еИСЕЯВЭЛЕМА"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "_жэЙЕККОР"
+#~ msgid "Account Properties"
+#~ msgstr "еПИСЩМАЬГ"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "сГЛЕъЫ_ЛА"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Get Mail"
-msgstr "_лчМУЛА"
+#~ msgid "Full Name:"
+#~ msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+#~ msgid "Hostname:"
+#~ msgstr "сГЛЕъЫ_ЛА"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#~ msgid "Mail Account"
+#~ msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+#~ msgid "News"
+#~ msgstr "_мщО"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "_жэЙЕККОР"
+#~ msgid "Optional"
+#~ msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "аПОСТОКч"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr ""
+#, fuzzy
+#~ msgid "Sources"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Move"
-msgstr "_лчМУЛА"
+#~ msgid "minute(s)"
+#~ msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Move message to a new folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+#~ msgid "Mail source type:"
+#~ msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#, fuzzy
+#~ msgid "Add Source"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-mail.xml.h:33
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+#~ msgid "Add News Server"
+#~ msgstr "мщА оЛэДА"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Sources"
+#~ msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+#~ msgid "News Sources"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete a contact"
+#~ msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr ""
+#, fuzzy
+#~ msgid "Print contacts"
+#~ msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr ""
+#, fuzzy
+#~ msgid "View all contacts"
+#~ msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print Contacts..."
+#~ msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+#~ msgid "Ca_lendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#, fuzzy
+#~ msgid "Open a calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#, fuzzy
+#~ msgid "Print this calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#~ msgid "_New"
+#~ msgstr "_мщО"
 
-#: ui/evolution-mail.xml.h:50
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "_жэЙЕККОР"
+#~ msgid "_Open Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-mail.xml.h:51
 #, fuzzy
-msgid "_Configure Folder"
-msgstr "_мщОР жэЙЕККОР"
+#~ msgid "_Print this calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#~ msgid "_Save As..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#~ msgid "Delete this item"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr ""
+#, fuzzy
+#~ msgid "Print En_velope..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+#~ msgid "Print..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#~ msgid "Save _As..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail.xml.h:62
 #, fuzzy
-msgid "_Open in New Window"
-msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
+#~ msgid "_File"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+#~ msgid "_Print..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr ""
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "мщА сУМТЭЛЕУСГ"
+#~ msgid "C_ut"
+#~ msgstr "йОПч"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr ""
+#~ msgid "Copy"
+#~ msgstr "аМТИЦЯАЖч"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#~ msgid "Cut"
+#~ msgstr "йОПч"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "_жэЙЕККОР"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "я_АМТЕБОЩ"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "еПИСЩМАЬГ"
+#~ msgid "Paste"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
+#~ msgid "Paste the clipboard"
+#~ msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#~ msgid "Print S_etup..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
-
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "иДИЭТГТЕР"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "╤МОИЦЛА жАЙщККОУ"
+#~ msgid "Redo"
+#~ msgstr "дИАЦЯАЖч"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "еКчЖХГ"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Undo"
+#~ msgstr "аЙЩЯЫСГ"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "гЛЕЯОКЭЦИО"
+#~ msgid "Undo the last action"
+#~ msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#~ msgid "_Copy"
+#~ msgstr "аМТИЦЯАЖч"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "аПОСТОКч"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
+#~ msgid "_Find..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+#~ msgid "_Help"
+#~ msgstr "сГЛЕъЫ_ЛА"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+#~ msgid "_Paste"
+#~ msgstr "еПИЙЭККГСГ"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#~ msgid "_Print"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
+#~ msgid "_Properties..."
+#~ msgstr "иДИЭТГТЕР"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+#~ msgid "_Undo"
+#~ msgstr "аЙЩЯЫСГ"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+#~ msgid "Compose a new message"
+#~ msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#~ msgid "Copy message to a new folder"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "╤МОИ_ЦЛА"
-
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#~ msgid "F_older"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr ""
-
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr ""
-
-#: ui/evolution.xml.h:8
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
-
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
-
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
+#~ msgid "Get Mail"
+#~ msgstr "_лчМУЛА"
 
-#: ui/evolution.xml.h:12
 #, fuzzy
-msgid "Show the _Folder Bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+#~ msgid "Hide _Read messages"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Move"
+#~ msgstr "_лчМУЛА"
 
-#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+#~ msgid "Move message to a new folder"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr ""
+#, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr ""
+#, fuzzy
+#~ msgid "_Apply Filters"
+#~ msgstr "_жэЙЕККОР"
 
-#: ui/evolution.xml.h:22
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "я_АМТЕБОЩ"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_цМЫЯИЛъА"
+#~ msgid "_Edit Message"
+#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_жэЙЕККОР"
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#~ msgid "_Move to Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr ""
+#, fuzzy
+#~ msgid "_Open in New Window"
+#~ msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: ui/evolution.xml.h:30
 #, fuzzy
-msgid "_Mail message (FIXME)"
-msgstr "_лчМУЛА"
+#~ msgid "_Print Message"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution.xml.h:32
 #, fuzzy
-msgid "_Settings"
-msgstr "е_МщЯЦЕИЕР"
+#~ msgid "_Source"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#~ msgid "Attach"
+#~ msgstr "еПИСЩМАЬГ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-msgid "_Options"
-msgstr "е_МщЯЦЕИЕР"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#~ msgid "Send"
+#~ msgstr "аПОСТОКч"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "╤МОИ_ЦЛА"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #, fuzzy
-msgid "Meeting _start time:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 #, fuzzy
-msgid "Meeting _end time:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#, fuzzy
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "я_АМТЕБОЩ"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr ""
+#~ msgid "_Folder"
+#~ msgstr "_жэЙЕККОР"
 
-#: widgets/misc/e-dateedit.c:407
 #, fuzzy
-msgid "Now"
-msgstr "_мщО"
+#~ msgid "_Go to Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#, fuzzy
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_лчМУЛА"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr ""
+#, fuzzy
+#~ msgid "_Settings"
+#~ msgstr "е_МщЯЦЕИЕР"
 
 #, fuzzy
 #~ msgid "Appointments:"
@@ -7129,10 +5701,6 @@ msgstr ""
 #~ msgstr "счЛЕЯА"
 
 #, fuzzy
-#~ msgid "last"
-#~ msgstr "еПИЙЭККГСГ"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "пЯОТЕЯАИЭТГТА"
 
@@ -7184,10 +5752,6 @@ msgstr ""
 #~ msgstr "гЛЕЯОКЭЦИО"
 
 #, fuzzy
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "я_АМТЕБОЩ"
-
-#, fuzzy
 #~ msgid "_New Contact"
 #~ msgstr "_цМЫЯИЛъА"
 
@@ -7257,15 +5821,6 @@ 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 ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
 
@@ -7281,10 +5836,6 @@ msgstr ""
 #~ msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
 #, fuzzy
-#~ msgid "Show _shortcut bar"
-#~ msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
-
-#, fuzzy
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 88da06ada7..7be1b22d4d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -14,197 +14,363 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, c-format
+msgid "No such message: %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Colours"
+
+#: executive-summary/component/e-summary-url.c:68
+#, c-format
+msgid "Move %s to the left"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:933
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr ""
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr ""
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -220,29 +386,18 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -358,40 +513,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/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.
@@ -401,7 +548,7 @@ msgid "_Add"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr ""
 
@@ -414,14 +561,7 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -479,7 +619,6 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -496,8 +635,6 @@ msgid "_Address..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr ""
 
@@ -542,24 +679,27 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -568,6 +708,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr ""
 
@@ -577,28 +718,33 @@ msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr ""
 
@@ -607,10 +753,12 @@ msgid "Other Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr ""
 
@@ -627,62 +775,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/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.
 #. * DO NOT compile it as part of your application.
@@ -745,12 +847,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -775,27 +872,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -820,9 +917,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr ""
 
@@ -855,12 +952,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr ""
 
@@ -877,12 +972,10 @@ msgid "Search Scope:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr ""
 
@@ -905,190 +998,80 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from:"
-msgstr ""
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisation"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1097,179 +1080,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1278,13 +1088,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1296,71 +1106,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-msgid "Calendar Server"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr ""
 
@@ -1370,25 +1126,25 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1396,60 +1152,57 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1458,7 +1211,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1466,851 +1219,412 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:224
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
-msgid "Loading Calendar"
-msgstr ""
-
-#: calendar/gui/control-factory.c:125
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Colours"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
+#: calendar/gui/calendar-summary.c:484
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
+#: calendar/gui/calendar-summary.c:489
+msgid "Show appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/calendar-summary.c:497
+msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/calendar-summary.c:583
+msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:158
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/e-calendar-table.c:163
+msgid "Summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
+#: calendar/gui/e-tasks.c:285
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:696
 #, c-format
-msgid "Could not create a calendar in `%s'"
+msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "April"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:15
-msgid "March"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:16
-msgid "May"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:18
-msgid "October"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
 msgstr ""
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
@@ -2503,10 +1817,14 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr ""
 
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2597,78 +1915,84 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2684,40 +2008,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2729,25 +2054,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2755,13 +2080,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, 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)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2769,7 +2094,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2777,7 +2102,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3098,8 +2423,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3128,71 +2453,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr ""
 
@@ -3240,130 +2564,123 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3406,12 +2723,11 @@ msgid "attachment"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr ""
 
@@ -3427,66 +2743,50 @@ msgstr ""
 msgid "Attach a file to the message"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr ""
 
@@ -3497,91 +2797,87 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, 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 "year"
 msgstr ""
@@ -3706,7 +3002,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3803,185 +3099,166 @@ msgstr ""
 msgid "Read"
 msgstr ""
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr ""
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Assign Score"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "before"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Forward to Address"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
@@ -4000,10 +3277,6 @@ msgstr ""
 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 ""
@@ -4012,204 +3285,160 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
+#: mail/folder-browser.c:658
+msgid "Open"
 msgstr ""
 
-#: mail/folder-browser.c:657
-msgid "Hide selected"
+#: mail/folder-browser.c:659
+msgid "Edit"
 msgstr ""
 
-#. could use another mask, but not enough api do to it
 #: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr ""
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
-msgid "Open"
-msgstr ""
-
-#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr ""
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr ""
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr ""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-msgid "Current store format:"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
 msgstr ""
 
-#: mail/local-config.glade.h:7
-msgid "Mailbox Format"
+#: mail/mail-accounts.c:115
+msgid " (default)"
 msgstr ""
 
-#: mail/local-config.glade.h:8
-msgid "New store format:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:12
-msgid "mh"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+msgid "Evolution Account Editor"
 msgstr ""
 
 #: mail/mail-autofilter.c:71
@@ -4232,7 +3461,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4240,504 +3469,108 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Account Properties"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Default"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:26
-msgid "Delete mail from server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Done"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:28
-msgid "E-Mail Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Email Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Full Name:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Hostname:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:41
-msgid "Mail Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-msgid "News"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Optional"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:57
-msgid "Reply-to:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Save password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Select signature file"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:62
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Server Type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-msgid "Servers"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Signature:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-msgid "User Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-msgid "minute(s)"
-msgstr ""
-
-#: mail/mail-config-gui.c:433
-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 ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organisation, and the name of a file to "
-"read your signature from."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr ""
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr ""
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr ""
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr ""
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-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
-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: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"
-"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:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: 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 "Querying authorisation capabilities of \"%s\""
-
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Query authorisation at \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr ""
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr ""
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr ""
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
 #: mail/mail-display.c:98
@@ -4774,65 +3607,65 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4888,7 +3721,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -4913,156 +3746,156 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr ""
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr ""
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5073,7 +3906,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5175,111 +4008,182 @@ msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+msgid "Attachment"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "From"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "Date"
+msgstr ""
+
+#: mail/message-list.c:1110
+msgid "Received"
+msgstr ""
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr ""
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr ""
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr ""
+
+#: mail/subscribe-dialog.c:63
+msgid "Store"
+msgstr ""
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5370,30 +4274,30 @@ msgstr ""
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 msgid "Go to folder..."
 msgstr ""
 
@@ -5401,13 +4305,18 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
 #, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s"
+msgstr ""
+
+#: shell/e-shell-view.c:1100
+#, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr ""
 
 #: shell/e-shell.c:372
@@ -5415,73 +4324,81 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5489,12 +4406,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr ""
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr ""
 
@@ -5586,1107 +4502,256 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
+#: ui/evolution-contact-editor.xml:31
 msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-contact-editor.xml:35
 msgid "FIXME: Save Attac_hments..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:56
+#: ui/evolution-contact-editor.xml:38
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-contact-editor.xml:63
+msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
+#: ui/evolution-contact-editor.xml:93
+msgid "FIXME: __Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:77
+#: ui/evolution-contact-editor.xml:101
 msgid "Pre_vious"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
-
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:122
+#: ui/evolution-contact-editor.xml:104
 msgid "_Toolbars"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
 msgstr ""
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
+#: ui/evolution-contact-editor.xml:146
+msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
 msgstr ""
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
 msgstr ""
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
 msgstr ""
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
@@ -6783,7 +4848,7 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:111
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
@@ -6791,6 +4856,10 @@ msgstr ""
 msgid "Now"
 msgstr ""
 
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr ""
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
 #: widgets/misc/e-dateedit.c:1486
@@ -6803,11 +4872,50 @@ msgstr ""
 msgid "%I:%M %p"
 msgstr ""
 
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr ""
 
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Post Code:"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Cannot initialise Evolution's mail summary component."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#~ msgid "Colors"
+#~ msgstr "Colours"
+
+#~ msgid "Pick a color"
+#~ msgstr "Pick a colour"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisation:"
+
+#~ 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 ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organisation, and the name of a file to "
+#~ "read your signature from."
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Querying authorisation capabilities of \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Query authorisation at \"%s\""
+
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synchronise \"%s\""
 
diff --git a/po/es.po b/po/es.po
index 5ef73d2980..41d98a4d8a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-01-15 21:20+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -15,6 +15,180 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No puedo inicializar el componente de correo de Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "No se puede inicializar Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "Archivos de correo en formato maildir de Qmail"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "No existe ese mensaje"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Recogiendo correo de %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Cerrar"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mover a la carpeta"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ir al elemento anterior"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ir al siguiente elemento"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configurar carpeta..."
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"No pude abrir el archivo %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Error leyendo el archivo de correo: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Sin errores"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "ConexiСn cancelada"
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "No pude conectar con el servidor POP en: %s"
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nuevo"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Crear un nuevo contacto"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "No puedo inicializar el componente de correo de Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "No se puede inicializar Bonobo"
+
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Tarjeta: "
@@ -301,17 +475,6 @@ msgstr ""
 "\n"
 "Llave pЗblica: "
 
-#: 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:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1155
-#: calendar/conduits/todo/todo-conduit.c:976 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "No se puede 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.
@@ -440,14 +603,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
 #: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:555
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:556
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
@@ -457,14 +620,6 @@ msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de direcciones del pilot"
 
 #.
-#. * Translatable strings file generated by 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 "©Borrar contacto?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -474,7 +629,7 @@ msgid "_Add"
 msgstr "_AЯadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -487,13 +642,7 @@ msgstr "Tipos de telИfono"
 msgid "New phone type"
 msgstr "Nuevo 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
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "AЯadir"
 
@@ -551,7 +700,6 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
@@ -568,7 +716,6 @@ msgid "_Address..."
 msgstr "_DirecciСn..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "General"
 
@@ -613,7 +760,6 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalles"
 
@@ -720,54 +866,6 @@ 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.
-#.
-#: po/tmp/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "DirecciСn _2:"
-
-#: po/tmp/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Canada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Comprobar DirecciСn"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "P_aМs:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finlandia"
-
-#: po/tmp/fulladdr.glade.h:11
-msgid "USA"
-msgstr "USA"
-
-#: po/tmp/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_DirecciСn:"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Ciudad:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_DirecciСn:"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "CСdigo _Postal"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -834,12 +932,7 @@ msgstr "_Sufijo:"
 msgid "As _Minicards"
 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:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como _Tabla"
 
@@ -917,7 +1010,7 @@ msgid "None (anonymous mode)"
 msgstr "Ninguno (modo anonimo)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
@@ -956,7 +1049,6 @@ msgid "Remember this password"
 msgstr "Recuerda esta contraseЯa"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -973,12 +1065,10 @@ msgid "Search Scope:"
 msgstr "Rango de busqueda:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "AutentificaciСn:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -1003,184 +1093,27 @@ msgstr ""
 "informaciСn relevante acerca de ella."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Nombre:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "DescripciСn:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Fuentes de la agenda de direcciones"
-
-#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: 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:24
-msgid "Delete"
-msgstr "Borrar"
-
-#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Nombre"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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 "Buscar..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Lista de destinatarios"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-msgstr "Seleccionar nombre de:"
-
 #: 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.
-#.
-#: 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"
-
-#: 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:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Nombre"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:566
 msgid "Email"
 msgstr "Correo electrСnico"
@@ -1247,178 +1180,6 @@ msgstr ""
 "\n"
 "Pulse dos veces aquМ para crear un nuevo contacto."
 
-#.
-#. * 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 "Formularios vacМos al final:"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Cuerpo"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Pie:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensiones:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Fuente..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Fuentes"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Pie:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Formatear"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Cabecera"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Cabecera/Pie"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Cabecera"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Cabeceras para cada carta"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Alto:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Uno inmediatamente detrАs del otro"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Incluye:"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Horizontal"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Izquierda:"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Las pestaЯas con las letras a la derecha"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Margenes"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "NЗmero de columnas:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Opciones"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "OrientaciСn"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Pagina"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "ConfiguraciСn de la pАgina:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papel"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Fuente del papel:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Vertical"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Vista previa:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Imprimir usando un oscurecimiento gris"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Reverso en pАginas impares"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Derecha:"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Secciones:"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Oscureciendo"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "TamaЯo:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Comenzar en una nueva pАgina"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Nombre del estilo:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Encabezado:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Tipo:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Ancho:"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Enlace con el Calendario de Evolution"
@@ -1428,13 +1189,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:690
-#: calendar/conduits/todo/todo-conduit.c:511
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:792
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de calendario del pilot"
 
@@ -1446,8 +1207,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:610
-#: calendar/conduits/todo/todo-conduit.c:613
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaciСn ToDo de la pilot"
 
@@ -1456,7 +1217,7 @@ msgstr "No pude leer los datos de la aplicaciСn ToDo de la pilot"
 msgid "Reminder of your appointment at "
 msgstr "Recordatorio de su cita el "
 
-#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Pitido"
 
@@ -1466,25 +1227,25 @@ msgstr "Pitido"
 msgid "Ok"
 msgstr "OK"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Archivo no encontrado"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Abrir calendario"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Guardar calendario"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:328
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1492,57 +1253,57 @@ msgstr "%a %m %d %Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:336 calendar/gui/calendar-model.c:765
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:370 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:541
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:770
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1554,7 +1315,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1562,27 +1323,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:889
+#: calendar/gui/calendar-model.c:893
 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:892
+#: calendar/gui/calendar-model.c:896
 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:896
+#: calendar/gui/calendar-model.c:900
 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:899
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1019
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1592,47 +1353,43 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1059
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1099
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioridad debe estar entre 1 y 9"
 
-#: calendar/gui/calendar-summary.c:93
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:299
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Error cargando el calendario</b>"
 
-#: calendar/gui/calendar-summary.c:304
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>Error cargando el calendario:<br>Calendario en uso."
-
-#: calendar/gui/calendar-summary.c:310
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Error cargando el calendario:<br>Metodo no soportado"
 
-#: calendar/gui/calendar-summary.c:476
+#: calendar/gui/calendar-summary.c:484
 msgid "Display"
 msgstr "Mostrar"
 
-#: calendar/gui/calendar-summary.c:481
+#: calendar/gui/calendar-summary.c:489
 msgid "Show appointments"
 msgstr "Mostrar citas"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:497
 msgid "Show tasks"
 msgstr "Mostar tareas"
 
-#: calendar/gui/calendar-summary.c:581
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "Cargando calendario"
 
@@ -1640,570 +1397,229 @@ msgstr "Cargando calendario"
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarА el calendario"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma en %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "No hay un sumario disponible."
 
-#.
-#. * 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 "Cerrar"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Editas una cita"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Tiempo de pitido (minutos)"
-
-#.
-#. * 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 minutos"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minutos"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 horas"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minutos"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Las alarmas cesan tras"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Alarmas auditivas"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Pitar cuando aparezca la ventana de la alarma."
-
-#: po/tmp/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Calendario"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Preferencias del calendario"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Colores"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Comprimir fines de semana"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Opciones de la fecha del navegador"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Valores predeterminados"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Mostrar opciones"
-
-#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Fecha de plazo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Habilitar pitido para"
-
-#: po/tmp/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Fin del dМa:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Primer dМa de la semana:"
-
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "Vier"
-
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "Viernes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Marcar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Elementos de plazo hoy"
-
-#: po/tmp/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Elementos con plazo para hoy:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr "Elementos dentro de plazo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "Elementos dentro del plazo:"
-
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
-msgid "Monday"
-msgstr "Lunes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "Elementos fuera de plazo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Elementos fuera de plazo:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Elije un color"
-
-#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "Prioridad"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Recuerdame todas las citas"
-
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "Sab"
-
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "SАbado"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Mostrar"
-
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Mostrar la hora del final de las citas"
-
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Mostrar los numeros de las semanas"
-
-#: po/tmp/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Comienzo del dМa:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "Domingo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "Tabla de tares"
-
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "Jue"
-
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "Jueves"
-
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "Tiempo hasta el plazo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Divisiones de tiempo:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Formato del tiempo:"
-
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/event-editor.c:435 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 visuales"
-
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Mier"
-
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "MiИrcoles"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Semana laboral"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocurra."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "segundos."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "©Esta seguro que quiere borrar la cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "©Esta seguro que quiere borrar esta cita sin tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "©Esta seguro que quiere borrar la tarea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "©Esta seguro que quiere borrar esta tarea sin tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "©Esta seguro que quiere borrar la entrada del diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "©Esta seguro que quiere borrar esta entrada del diario sin tМtulo?"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% Comp_leto:"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "C_lasificaciСn:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Cancelar"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Completado"
-
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Fecha Completada:"
-
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Alta"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "En proceso"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Baja"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ninguno"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Sin comenzando"
-
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "Res_umen"
-
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Fecha de Ini_cio:"
-
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Tarea"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "Undefined"
-msgstr "Sin definir"
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Due Date:"
-msgstr "Fecha _de Fin:"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Priority:"
-msgstr "_Prioridad:"
-
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "_Status:"
-msgstr "E_stado:"
-
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "dialogo del editor de tareas"
-
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Editar Tarea"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "©Desea guardar los cambios?"
 
-#: calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-calendar-table.c:154
 msgid "Categories"
 msgstr "CategorМas"
 
-#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:155
 msgid "Classification"
 msgstr "ClasificaciСn"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:156
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
 #: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Fecha de plazo"
+
+#: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr "PosiciСn geogrАfica"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Precent complete"
 msgstr "Porcentaje completado"
 
 #: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioridad"
+
+#: calendar/gui/e-calendar-table.c:163
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Abrir la tarea"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Marcar la tarea como completa"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Borrar"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Borrar la tarea"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 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:1213
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1227
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1240
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
-#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
-#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nueva cita..."
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Hacer esta cita movible"
 
-#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Borrar todas las ocurrencias"
 
-#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
-#: calendar/gui/e-tasks.c:608
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/e-tasks.c:162
+#: calendar/gui/e-tasks.c:146
 msgid "Category:"
 msgstr "CategorМas:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:345
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "No puedo crear un archivo de tareas en `%s'"
-
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
@@ -2211,272 +1627,109 @@ msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d de %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Evento para todo e_l dМa"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Bases de la citas"
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "DМas"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Cada"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Excepciones"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Horas"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Enviar _a:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minutos"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "Modificar"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr "Sin recurrencia"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr "Vista previa"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Pri_vado"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "PЗ_blico"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr "Regla de recurrencia"
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "Resu_men:"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Hora"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "_Audio"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Contactos"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "_Mostrar"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Hora de _fin:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "_Correo"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "_Programa"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "Ejecuta_r programa:"
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "Hora de _inicio:"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "Fecha de Ini_cio:"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
-msgstr "dМa(s)"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "para"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Editar Cita"
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "siempre"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "en"
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dМa"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr "mes(es)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Lunes"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr "hasta"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Martes"
 
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr "semana(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "MiИrcoles"
 
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr "aЯo(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Jueves"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Editar Cita"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Viernes"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "en"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "SАbado"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dМa"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Domingo"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "╨"
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/event-editor.c:838
+#: 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:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:709
-#, c-format
-msgid "Could not load the folder in `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
 msgstr "No puedo cargar la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:720
-#, c-format
-msgid "Could not create a folder in `%s'"
-msgstr "No puedo crear una carpeta en `%s'"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-msgid "April"
-msgstr "Abril"
-
-#: po/tmp/goto-dialog.glade.h:7
-msgid "August"
-msgstr "Agosto"
-
-#: po/tmp/goto-dialog.glade.h:8
-msgid "December"
-msgstr "Diciembre"
-
-#: po/tmp/goto-dialog.glade.h:9
-msgid "February"
-msgstr "Febrero"
-
-#: po/tmp/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr "Ir a una fecha"
-
-#: po/tmp/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr "Ir a hoy"
-
-#: po/tmp/goto-dialog.glade.h:12
-msgid "January"
-msgstr "Enero"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
 
-#: po/tmp/goto-dialog.glade.h:13
-msgid "July"
-msgstr "Julio"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
 
-#: po/tmp/goto-dialog.glade.h:14
-msgid "June"
-msgstr "Junio"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
 
-#: po/tmp/goto-dialog.glade.h:15
-msgid "March"
-msgstr "Marzo"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
 
-#: po/tmp/goto-dialog.glade.h:16
-msgid "May"
-msgstr "Mayo"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mier"
 
-#: po/tmp/goto-dialog.glade.h:17
-msgid "November"
-msgstr "Noviembre"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Jue"
 
-#: po/tmp/goto-dialog.glade.h:18
-msgid "October"
-msgstr "Octubre"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Vier"
 
-#: po/tmp/goto-dialog.glade.h:19
-msgid "September"
-msgstr "Septiembre"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sab"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -2670,7 +1923,7 @@ msgstr "AЯo actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -2778,22 +2031,23 @@ msgstr "%s servidor %s"
 msgid "%s service for %s on %s"
 msgstr "%s servico para %s en %s"
 
-#: camel/camel-remote-store.c:315
+#: camel/camel-remote-store.c:318
 msgid "Connection cancelled"
 msgstr "ConexiСn cancelada"
 
-#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/camel-remote-store.c:319 camel/camel-remote-store.c:332
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:423 camel/camel-remote-store.c:485
-#: camel/camel-remote-store.c:553
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "OperaciСn cancelada"
 
@@ -2822,12 +2076,12 @@ msgstr "No existe el servidor %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "No se puede obtener la direcciСn del servidor %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2864,40 +2118,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaciСn erronea desde el servidor."
 
-#: camel/providers/imap/camel-imap-command.c:233
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inexperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: camel/providers/imap/camel-imap-command.c:288
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor termino demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:424
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no contenia informaciСn de %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:625
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -2909,26 +2164,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "ConectarА con el servidor IMAP usando una contraseЯa de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:261
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Esta opciСn conectarА con el servidor IMAP usando autentificaciСn Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:335
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contraseЯa IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:363
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2939,7 +2194,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:619
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
@@ -3407,7 +2662,6 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3479,7 +2733,6 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:295
-#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3537,50 +2790,50 @@ msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "ExpirС el tiempo para RCPT TO: %s: correo no enviado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:574
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "ExpirС el tiempo para DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:621
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Respuesta de error a DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
-#: camel/providers/smtp/camel-smtp-transport.c:654
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "ExpirС el tiempo para el envio de DATA: terminaciСn del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Respuesta de error a DATA: terminaciСn del mensaje: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:694
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "ExpirС el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "ExpirС el tiempo para QUIT: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -3623,12 +2876,11 @@ msgid "attachment"
 msgstr "adjunto"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Quitar"
 
@@ -3644,22 +2896,6 @@ msgstr "Incluir adjunto..."
 msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
-#.
-#. * 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 "Propiedades del adjunto"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nombre del fichero:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
 #: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
 #: mail/mail-format.c:624
 msgid "From:"
@@ -3718,38 +2954,38 @@ msgstr ""
 "No pude abrir el archivo de firma %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Guardando cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Guardar cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error guardando el mensaje en 'Drafts': %s"
 
-#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:760
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3759,27 +2995,27 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:921
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:963
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3787,26 +3023,22 @@ msgstr ""
 "El archivo es muy largo (mАs de 100K).\n"
 "©Esta seguro que quiere aЯadirlo?"
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leМa el archivo."
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1441
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
-#: composer/evolution-composer.c:345
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Bus_car"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "aЯo"
@@ -3939,7 +3171,7 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Editar filtros"
 
@@ -4042,30 +3274,6 @@ msgstr "Importante"
 msgid "Read"
 msgstr "LeМdo"
 
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Editar carpeta virtual"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Reglas para los filtro"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "Entrando"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "Saliente"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Carpetas virtuales"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Fuentes de la carpeta virtual"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -4124,7 +3332,7 @@ msgid "Regex Match"
 msgstr "ExpresiСn regular"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1107
+#: mail/message-list.c:1109
 msgid "Score"
 msgstr "PuntuaciСn"
 
@@ -4144,7 +3352,7 @@ msgstr "Fuente"
 msgid "Specific header"
 msgstr "Cabecera especМfica"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1107
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
 msgid "Status"
 msgstr "Estado"
 
@@ -4152,7 +3360,7 @@ msgstr "Estado"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1108
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
 msgid "Subject"
 msgstr "Asunto"
 
@@ -4252,11 +3460,11 @@ msgstr "AЯadir regla para carpeta virtual"
 msgid "Edit VFolder Rule"
 msgstr "Editar regla de VFolder"
 
-#: mail/component-factory.c:282
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:318
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
@@ -4312,17 +3520,19 @@ msgstr "Filtrar segЗn los destinatarios"
 msgid "Filter on Mailing List"
 msgstr "Filtrar segЗn la lista de correo"
 
-#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Abrir"
 
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Editar"
+
 #: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #: mail/folder-browser.c:661 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:31
 msgid "Print"
 msgstr "Imprimir"
 
@@ -4331,16 +3541,14 @@ msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
 #: mail/folder-browser.c:664 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Re: Todos"
 
 #: mail/folder-browser.c:665 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
@@ -4379,45 +3587,33 @@ msgstr "Crear una regla con el mensaje"
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar segЗn la lista de correo (%s)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-msgid "Current store format:"
-msgstr "Formato de almacenamiento actual:"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr "Formato Mailbox"
-
-#: po/tmp/local-config.glade.h:8
-msgid "New store format:"
-msgstr "Nuevo formato de almacenamiento:"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr "Nota: Cuando se convierte entre distintos tipos de formato, fallos\n"
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr "maildir"
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr "mbox"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ninguno"
 
-#: po/tmp/local-config.glade.h:14
-msgid "mh"
-msgstr "mh"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Valores predeterminados"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:341
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:605
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
@@ -4441,7 +3637,7 @@ msgstr "Correo de %s"
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4453,7 +3649,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "©QuerrМa configurarlo ahora?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4461,7 +3657,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4469,15 +3665,15 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "No tiene Outbox configurado"
 
-#: mail/mail-callbacks.c:258
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4485,27 +3681,27 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "©Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:345
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:567
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:648
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:785
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4513,11 +3709,11 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:818 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "©Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:822 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4525,15 +3721,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "©Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:867
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:869
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:953
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4542,242 +3738,22 @@ msgstr ""
 "Error cargando la informaciСn del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1002
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1049
+#: mail/mail-callbacks.c:1075
 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.glade.h:6
-msgid "Account"
-msgstr "Cuenta"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "InformaciСn de la cuenta"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "GestiСn de la cuenta"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "Propiedades de la cuenta"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "AutentificaciСn"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Tipo de autentificaciСn:"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Enhorabuena, se ha completado la configuraciСn de su correo.\n"
-
-#: po/tmp/mail-config.glade.h:22
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:23
-msgid "Default"
-msgstr "Valores predeterminados"
-
-#: po/tmp/mail-config.glade.h:25
-msgid "Done"
-msgstr "Hecho"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "E-Mail Address:"
-msgstr "DirecciСn de correo:"
-
-#: po/tmp/mail-config.glade.h:28
-msgid "Email Address:"
-msgstr "DirecciСn de correo:"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraciСn del correo de Evolution"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: po/tmp/mail-config.glade.h:33
-msgid "Hostname:"
-msgstr "Nombre del servidor:"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Identity"
-msgstr "Identidad"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Incoming Mail Server"
-msgstr "Servidor del correo de entrada"
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Keep mail on server"
-msgstr "Dejar mensajes en el servidor"
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Mail"
-msgstr "Correo"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail Account"
-msgstr "Cuenta de correo"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Configuration"
-msgstr "ConfiguraciСn del correo"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration Druid"
-msgstr "Ayudante para la configuraciСn del correo"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Make this my default account"
-msgstr "Hacer de esta mi cuenta predeterminada"
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Miscellaneous"
-msgstr "Miscelanea"
-
-#: po/tmp/mail-config.glade.h:45
-msgid "News"
-msgstr "Noticias"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "Optional"
-msgstr "Opcional"
-
-#: po/tmp/mail-config.glade.h:48
-msgid "Organization:"
-msgstr "OrganizaciСn:"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Servidor de correo de salida"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Clave:"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Plain Text"
-msgstr "Texto plano"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Receiving Email"
-msgstr "Reciviendo mensajes"
-
-#: po/tmp/mail-config.glade.h:54
-msgid "Remember my password"
-msgstr "Recuerda mi contraseЯa"
-
-#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Required"
-msgstr "Requerido"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config.glade.h:58
-msgid "Save password"
-msgstr "Guardar clave"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Select signature file"
-msgstr "Elegir archivo de firma"
-
-#: po/tmp/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Enviando correo"
-
-#: po/tmp/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "ConfiguraciСn del servidor"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Tipo de servidor:"
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "El servidor requiere autentificaciСn"
-
-#: po/tmp/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Servidores"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Archivo de firma:"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Firma:"
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Fuentes"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Este servidor requiere una conexiСn segura (SSL)"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "Type"
-msgstr "Tipo"
-
-#: po/tmp/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Escriba el nombre por el cual le gustatМa referirse a estos servidores. Por "
-"ejemplo: \"Trabajo\" o \"Casa\"."
-
-#: po/tmp/mail-config.glade.h:73
-msgid "User Information"
-msgstr "InformaciСn del usuario"
-
-#: po/tmp/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Nombre:"
-
-#: po/tmp/mail-config.glade.h:75
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Bienvenido al ayudante de configuraciСn de correo de Evolution.\n"
-
-#: mail/mail-config-druid.c:346
+#: mail/mail-config-druid.c:363
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
 "You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:612
+#: mail/mail-config-druid.c:629
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -4785,7 +3761,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:889
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
@@ -4843,6 +3819,10 @@ msgstr "Ocultar"
 msgid "%s attachment"
 msgstr "%s adjunto"
 
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Responder a:"
+
 #: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
@@ -4970,143 +3950,143 @@ msgstr ""
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recogiendo correo de %s"
 
-#: mail/mail-ops.c:91
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recoger correo de %s"
 
-#: mail/mail-ops.c:336
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hay correo nuevo en %s"
 
-#: mail/mail-ops.c:406
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrando correo bajo demanda"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtrar correo bajo demanda"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: mail/mail-ops.c:670
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Enviando cola de correo"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Enviar cola"
 
-#: mail/mail-ops.c:813 mail/mail-ops.c:820
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "AЯadiendo \"%s\""
 
-#: mail/mail-ops.c:817 mail/mail-ops.c:823
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "AЯadiendo un mensaje sin asunto"
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Moviendo mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1108 mail/subscribe-dialog.c:348
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Sin descripciСn)"
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1214 mail/mail-ops.c:1283
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1345
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1443
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recogiendo mensaje %s"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Recogiendo mensajes"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1527
 #, 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:1664
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Cargando carpeta %s para %s"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Cargar carpeta %s para %s"
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1911
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5115,12 +4095,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5242,181 +4222,182 @@ msgstr "Nueva carpeta virtual"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:594
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:597
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:600
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:885
+#: mail/message-list.c:890
 #, 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:897 mail/message-list.c:913
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:900 mail/message-list.c:916
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:985
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:997
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1005
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1109
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1109
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1110
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1110
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1110
 msgid "Received"
 msgstr "Recivido"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1111
 msgid "To"
 msgstr "A"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1111
 msgid "Size"
 msgstr "TamaЯo"
 
-#: mail/openpgp-utils.c:76
-#, c-format
-msgid "Please enter your %s passphrase%s%s"
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
 msgstr "Por favor introduzca su frase %s %s%s"
 
-#: mail/openpgp-utils.c:77
-msgid " for "
-msgstr " para "
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Por favor introduzca su frase %s %s%s"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
 msgid "No GPG/PGP program available."
 msgstr "No hay programas disponibles de GPG/PGP."
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
 msgid "No password provided."
 msgstr "No se dio contraseЯa"
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
 msgid "No recipients specified"
 msgstr "No ha especificado destinatarios"
 
-#: mail/openpgp-utils.c:1061
+#: mail/openpgp-utils.c:1065
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: mail/subscribe-dialog.c:63 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:64
+#: mail/subscribe-dialog.c:63
 msgid "Store"
 msgstr "Almacenar"
 
-#: mail/subscribe-dialog.c:146
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Mostrar carpetas que comiencen por:"
 
-#: mail/subscribe-dialog.c:179
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Obteniendo sitio para \"%s\""
 
-#: mail/subscribe-dialog.c:182
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Obtiene sitio para \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Dessuscribiendo de carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:298
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Suscribir a carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:301
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Dessuscribir de carpeta \"%s\""
@@ -5528,7 +4509,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sin tМtulo)"
 
@@ -5566,9 +4547,14 @@ msgstr "(No hay carpetas mostrandose)"
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1093
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5662,13 +4648,11 @@ msgstr "Quitar este atajo de la lista de atajos"
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:36
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Ver"
 
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
@@ -5782,1263 +4766,1893 @@ msgstr "Deshabilitado."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Crear un nuevo contacto"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _New Appointment"
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Task _Request"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Mail Message"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contact"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nuevo"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Task"
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Imprimir contactos"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Task _Request"
 
-#: po/tmp/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Parar"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Journal Entry"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Parar la carga"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Note"
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Ver todo"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Ch_oose Form..."
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Ver todos los contactos"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: _Memo Style"
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "_ConfiguraciСn de la agenda de direcciones..."
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Define Print _Styles"
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Im_primir contactos..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: S_end"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "Bu_scar contactos"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Save Attac_hments..."
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Herramientas"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: _Move to Folder..."
 
-#.
-#. * 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 DМas"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Cop_y to Folder.."
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Alterar preferencias"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "ConfiguraciСn de la pАgina:"
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Ca_lendario"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Print Pre_view"
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Preferencias del calendario..."
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Paste _Special... "
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Marcar como no leМdo"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Creando un nuevo calendario"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objeto"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "DМa"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: _Item"
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Volver en el tiempo"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _Unread Item"
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Avanzar en el tiempo"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Fi_rst Item in Folder"
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Ir a"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Last Item in Folder"
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Ir a una fecha especМfica"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Ir al momento actual"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: _Formatting"
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mes"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Customize..."
+
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Pre_vio"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Siguiente"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Abrir un calendario"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Barra de _herramientas"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _File..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: It_em..."
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Object..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Font..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Paragraph..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Desi_gn This Form"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: D_esign a Form..."
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publish _Form..."
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blish Form As..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Script _Debugger"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Spelling..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formularios"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "FIXME: _Contact"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: _Contact"
+
+#
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Enviar un _mensaje al contacto..."
+
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: _Contact"
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _Spelling..."
+
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: _Contact"
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: _Journal Entry"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: Cop_y to Folder.."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: _Mail Message"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: _Mail Message"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Forward as v_Calendar"
+
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: For_ward"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormatear"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Accio_nes"
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
 msgstr "Previo"
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Imprimir este calendario"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Ir al elemento anterior"
+
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "FIXME: _Note"
+
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Ir al siguiente elemento"
+
+#. 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:2471
+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"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupado"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Fuera de la oficina"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Sin informaciСn"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Invitar a otros..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opciones"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Mostrar _solo las horas de trabajo"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Mostrar quitando _Zoom"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Actualizar Libre/Ocupado"
+
+#: 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 "_Auto seleccionar"
+
+#: 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 "_Todas las personas y los recursos"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Todas las _personas y un recurso"
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Guardar el calendario como otra cosa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Personas _requeridas"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Personas requeridas y _un recurso"
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Mostrar 1 dМa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora de _inicio de la reuniСn:"
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Mostrar un mes"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora de _fin de la reuniСn:"
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Mostrar 1 semana"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Todos los participantes"
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Mostrar un semana laboral"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMJVSD"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Ahora"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Hoy"
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Semana"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
-msgid "_New"
-msgstr "_Nuevo"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Abrir calendario"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Bus_car"
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "Im_primir este calendario"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grupo %i"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "Guardar _como..."
+#~ msgid "Delete Contact?"
+#~ msgstr "©Borrar contacto?"
 
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Borrar este elemento"
+#~ msgid "Address _2:"
+#~ msgstr "DirecciСn _2:"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Borrar..."
+#~ msgid "Canada"
+#~ msgstr "Canada"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Ayuda"
+#~ msgid "Check Address"
+#~ msgstr "Comprobar DirecciСn"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Imprimir ca_becera..."
+#~ msgid "Countr_y:"
+#~ msgstr "P_aМs:"
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Imprimir esre elemento"
+#~ msgid "Finland"
+#~ msgstr "Finlandia"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Imprimir..."
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Guardar _como..."
+#~ msgid "_Address:"
+#~ msgstr "_DirecciСn:"
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Guardar y cerrar"
+#~ msgid "_City:"
+#~ msgstr "_Ciudad:"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Guardar el contacto y cerar la ventana de diАlogo"
+#~ msgid "_PO Box:"
+#~ msgstr "_DirecciСn:"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "E_nviar el contacto a otro..."
+#~ msgid "_State/Province:"
+#~ msgstr "E_stado/Provincia:"
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Ver la ayuda en lМnea"
+#~ msgid "_ZIP Code:"
+#~ msgstr "CСdigo _Postal"
 
-#
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Enviar un _mensaje al contacto..."
+#~ msgid "Addressbook Sources"
+#~ msgstr "Fuentes de la agenda de direcciones"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
-msgid "_File"
-msgstr "_Archivo"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "Im_primir..."
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Save"
-msgstr "_Guardar"
+#~ msgid "Message Recipients"
+#~ msgstr "Lista de destinatarios"
 
-#.
-#. * 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 "Acerca de esta aplicaciСn"
+#~ msgid "Select Names"
+#~ msgstr "_Seleccionar nombres"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Acerca de..."
+#~ msgid "Select name from:"
+#~ msgstr "Seleccionar nombre de:"
 
-#: po/tmp/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "Accio_nes"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "_Limpiar"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "C_ortar"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Limpiar"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Quitar la seleccionada"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Cerrar esta cita"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copiar"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Copiar la selecciСn"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Cortar"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Cortar la selecciСn"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "Volcar XML"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Volcar la descripciСn XML de la IU"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Address _Book..."
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Ch_oose Form..."
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Chec_k Names"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_y to Folder.."
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: D_esign a Form..."
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Define Print _Styles"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Desi_gn This Form"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Fi_rst Item in Folder"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: For_ward"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Forward as v_Calendar"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Help"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: In_complete Task"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Insert File"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Paste _Special... "
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Print Pre_view"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blish Form As..."
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publish _Form..."
+#~ msgid "Blank forms at end:"
+#~ msgstr "Formularios vacМos al final:"
 
-#: po/tmp/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Rec_urrence..."
+#~ msgid "Body"
+#~ msgstr "Cuerpo"
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: S_end"
+#~ msgid "Bottom:"
+#~ msgstr "Pie:"
 
-#: po/tmp/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Save Attac_hments..."
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensiones:"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Script _Debugger"
+#~ msgid "Font..."
+#~ msgstr "Fuente..."
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Task _Request"
+#~ msgid "Fonts"
+#~ msgstr "Fuentes"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contact"
+#~ msgid "Footer:"
+#~ msgstr "Pie:"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Customize..."
+#~ msgid "Format"
+#~ msgstr "Formatear"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _File..."
+#~ msgid "Header"
+#~ msgstr "Cabecera"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Font..."
+#~ msgid "Header/Footer"
+#~ msgstr "Cabecera/Pie"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Formatting"
+#~ msgid "Headings"
+#~ msgstr "Cabecera"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
+#~ msgid "Headings for each letter"
+#~ msgstr "Cabeceras para cada carta"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Journal Entry"
+#~ msgid "Height:"
+#~ msgstr "Alto:"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Last Item in Folder"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Uno inmediatamente detrАs del otro"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mail Message"
+#~ msgid "Include:"
+#~ msgstr "Incluye:"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo Style"
+#~ msgid "Landscape"
+#~ msgstr "Horizontal"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Move to Folder..."
+#~ msgid "Left:"
+#~ msgstr "Izquierda:"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _New Appointment"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Las pestaЯas con las letras a la derecha"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Note"
+#~ msgid "Margins"
+#~ msgstr "Margenes"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Object..."
+#~ msgid "Number of columns:"
+#~ msgstr "NЗmero de columnas:"
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Paragraph..."
+#~ msgid "Options"
+#~ msgstr "Opciones"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Spelling..."
+#~ msgid "Orientation"
+#~ msgstr "OrientaciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standard"
+#~ msgid "Page"
+#~ msgstr "Pagina"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Task"
+#~ msgid "Paper"
+#~ msgstr "Papel"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Unread Item"
+#~ msgid "Paper source:"
+#~ msgstr "Fuente del papel:"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr "FIXME: what goes here?"
+#~ msgid "Portrait"
+#~ msgstr "Vertical"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormatear"
+#~ msgid "Preview:"
+#~ msgstr "Vista previa:"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Buscar de nuevo"
+#~ msgid "Print using gray shading"
+#~ msgstr "Imprimir usando un oscurecimiento gris"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Buscar de _nuevo"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Reverso en pАginas impares"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Ir al siguiente elemento"
+#~ msgid "Right:"
+#~ msgstr "Derecha:"
 
-#: po/tmp/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Ir al elemento anterior"
+#~ msgid "Sections:"
+#~ msgstr "Secciones:"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Propiedades las propiedades del archivo"
+#~ msgid "Shading"
+#~ msgstr "Oscureciendo"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "Sigui_ente"
+#~ msgid "Size:"
+#~ msgstr "TamaЯo:"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Pegar"
+#~ msgid "Start on a new page"
+#~ msgstr "Comenzar en una nueva pАgina"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Pegar el contenido del portapapeles"
+#~ msgid "Style name:"
+#~ msgstr "Nombre del estilo:"
 
-#: po/tmp/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "Pre_vio"
+#~ msgid "Top:"
+#~ msgstr "Encabezado:"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Previo"
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Configurar impr_esiСn..."
-
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Configurar impresiСn"
-
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Propiedades"
-
-#: po/tmp/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Rehacer"
-
-#: po/tmp/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Rehacer la accciСn deshecha"
-
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Remplazar"
-
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Remplazar una cadena"
-
-#: po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Guardar"
-
-#: po/tmp/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Guardar la cita y cerrar la ventana de diАlogo"
-
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file"
-msgstr "Guardar archivo actual"
-
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Concertar encuentro"
-
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "Concertar un _encuentro"
-
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "Programas algЗn tipo de encuentro"
-
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Buscar de nuevo la misma cadena"
-
-#: po/tmp/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Buscar una cadena"
-
-#: po/tmp/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: po/tmp/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Seleccionar todo"
-
-#: po/tmp/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar los datos de la pАgina para la impresora actual"
-
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Deshacer"
-
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Deshacer la Зltima acciСn"
-
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_About..."
-msgstr "_Acerca de..."
-
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:41
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
-msgid "_Edit"
-msgstr "_Editar"
-
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Buscar..."
-
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formularios"
+#~ msgid "Width:"
+#~ msgstr "Ancho:"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
-msgid "_Help"
-msgstr "_Ayuda"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Insertar"
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>Error cargando el calendario:<br>Calendario en uso."
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objeto"
+#~ msgid "Edit appointment"
+#~ msgstr "Editas una cita"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Pegar"
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Tiempo de pitido (minutos)"
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "Im_primir"
+#~ msgid "05 minutes"
+#~ msgstr "05 minutos"
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#~ msgid "10 minutes"
+#~ msgstr "10 minutos"
 
-#: po/tmp/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "_Rehacer"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 horas (am/pm)"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Remplazar..."
+#~ msgid "15 minutes"
+#~ msgstr "15 minutos"
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "Barra de _herramientas"
+#~ msgid "24 hour"
+#~ msgstr "24 horas"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Deshacer"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutos"
 
-#.
-#. * 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 "Nuevo"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutos"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Escribir un nuevo mensaje"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Las alarmas cesan tras"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Copiar mensaje a una nueva carpeta"
+#~ msgid "Audio Alarms"
+#~ msgstr "Alarmas auditivas"
 
-#: po/tmp/evolution-mail.xml.h:10
-msgid "Create Rule"
-msgstr "Crear una regla"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pitar cuando aparezca la ventana de la alarma."
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Carpetas"
+#~ msgid "Calendar"
+#~ msgstr "Calendario"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrar segЗn el remitente"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias del calendario"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtrar segЗn los dest_inatarios"
+#~ msgid "Colors"
+#~ msgstr "Colores"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Olvidar _contraseЯa"
+#~ msgid "Compress weekends"
+#~ msgstr "Comprimir fines de semana"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Obtener"
+#~ msgid "Date navigator options"
+#~ msgstr "Opciones de la fecha del navegador"
 
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Hide S_elected Messages"
-msgstr "Ocultar los mensajes _seleccionados"
+#~ msgid "Defaults"
+#~ msgstr "Valores predeterminados"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensajes _borrados"
+#~ msgid "Display options"
+#~ msgstr "Mostrar opciones"
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Ocultar mensajes _leidos"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Habilitar pitido para"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Mail _Filters..."
-msgstr "_Filtros de correo..."
+#~ msgid "End of day:"
+#~ msgstr "Fin del dМa:"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Manage Subscriptions..."
-msgstr "Administrar suscripciones..."
+#~ msgid "First day of week:"
+#~ msgstr "Primer dМa de la semana:"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Mar_k As Read"
-msgstr "Mar_car como leМdo"
+#~ msgid "Highlight"
+#~ msgstr "Marcar"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mark As U_nread"
-msgstr "Marcar como _no leМdo"
+#~ msgid "Items Due Today"
+#~ msgstr "Elementos de plazo hoy"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Move"
-msgstr "Mover"
+#~ msgid "Items Due Today:"
+#~ msgstr "Elementos con plazo para hoy:"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move message to a new folder"
-msgstr "Mover mensaje a una nueva carpeta"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elementos dentro de plazo"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Previews the message to be printed"
-msgstr "Ver el mensaje que va a ser impreso"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elementos dentro del plazo:"
 
-#: po/tmp/evolution-mail.xml.h:32
-msgid "Print Preview of message..."
-msgstr "Vista previa del mensaje..."
+#~ msgid "Overdue Items"
+#~ msgstr "Elementos fuera de plazo"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print message to the printer"
-msgstr "Imprimir el mensaje en la impresora"
+#~ msgid "Overdue Items:"
+#~ msgstr "Elementos fuera de plazo:"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message..."
-msgstr "Imprimir mensaje..."
+#~ msgid "Pick a color"
+#~ msgstr "Elije un color"
 
-#: po/tmp/evolution-mail.xml.h:38
-msgid "Reply to _All"
-msgstr "Re: _Todos"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Recuerdame todas las citas"
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _Sender"
-msgstr "Resp. _Remitente"
+#~ msgid "Reminders"
+#~ msgstr "Recordatorios"
 
-#: po/tmp/evolution-mail.xml.h:42
-msgid "S_ource"
-msgstr "F_uente"
+#~ msgid "Show"
+#~ msgstr "Mostrar"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#~ msgid "Show appointment end times"
+#~ msgstr "Mostrar la hora del final de las citas"
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
+#~ msgid "Show week numbers"
+#~ msgstr "Mostrar los numeros de las semanas"
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All Messages"
-msgstr "Mostrar _todos los mensajes"
+#~ msgid "Start of day:"
+#~ msgstr "Comienzo del dМa:"
 
-#: po/tmp/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Lista de mensajes encadenados"
+#~ msgid "TaskPad"
+#~ msgstr "Tabla de tares"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "VFolder segЗn el _remitente"
+#~ msgid "Time Until Due"
+#~ msgstr "Tiempo hasta el plazo"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "VFolder segЗn los _destinatarios"
+#~ msgid "Time divisions:"
+#~ msgstr "Divisiones de tiempo:"
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr "Ver las fuentes del mensaje"
+#~ msgid "Time format:"
+#~ msgstr "Formato del tiempo:"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Aplicar filtro"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas visuales"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Configure Folder..."
-msgstr "_Configurar carpeta..."
+#~ msgid "Work week"
+#~ msgstr "Semana laboral"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes de que ocurra."
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Editar mensaje"
+#~ msgid "seconds."
+#~ msgstr "segundos."
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Comprimir"
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leto:"
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "_Filtrar segЗn el asunto"
+#~ msgid "C_lassification:"
+#~ msgstr "C_lasificaciСn:"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Reenviar"
+#~ msgid "Cancelled"
+#~ msgstr "Cancelar"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Invertir selecciСn"
+#~ msgid "Completed"
+#~ msgstr "Completado"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "_ConfiguraciСn del correo..."
+#~ msgid "Date Completed:"
+#~ msgstr "Fecha Completada:"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Mensaje"
+#~ msgid "High"
+#~ msgstr "Alta"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "_Mover a la carpeta..."
+#~ msgid "In Progress"
+#~ msgstr "En proceso"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Abrir en una nueva ventana"
+#~ msgid "Low"
+#~ msgstr "Baja"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "Im_primir mensaje"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "_Guardar mensaje como..."
+#~ msgid "Not Started"
+#~ msgstr "Sin comenzando"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Threaded"
-msgstr "_Encadenados"
+#~ msgid "S_ummary"
+#~ msgstr "Res_umen"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Undelete"
-msgstr "_Recuperar"
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Fecha de Ini_cio:"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_VFolder on Subject"
-msgstr "_VFolder segЗn el asunto"
+#~ msgid "Task"
+#~ msgstr "Tarea"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de carpetas _virtuales..."
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#.
-#. * 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 "Adjuntar"
+#~ msgid "Undefined"
+#~ msgstr "Sin definir"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Cerrar el archivo actual"
+#~ msgid "_Contacts..."
+#~ msgstr "_Contactos..."
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Encriptar este mensaje con PGP"
+#~ msgid "_Due Date:"
+#~ msgstr "Fecha _de Fin:"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "_Priority:"
+#~ msgstr "_Prioridad:"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Insertar un archivo como textp en el mensaje"
+#~ msgid "_Status:"
+#~ msgstr "E_stado:"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Insertar un archivo de texto..."
+#~ msgid "task-editor-dialog"
+#~ msgstr "dialogo del editor de tareas"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Abrir un archivo"
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "No puedo crear un archivo de tareas en `%s'"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "Encriptar con PGP"
+#~ msgid "A_ll day event"
+#~ msgstr "Evento para todo e_l dМa"
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "Firmar con PGP"
+#~ msgid "Appointment Basics"
+#~ msgstr "Bases de la citas"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Guardar como"
+#~ msgid "Custom recurrence"
+#~ msgstr "Recurrencia personalizada"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr "Guardar _Borrador"
+#~ msgid "Days"
+#~ msgstr "DМas"
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in _folder... (FIXME)"
-msgstr "Save in _folder... (FIXME)"
+#~ msgid "Every"
+#~ msgstr "Cada"
 
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Guardar en carpeta..."
+#~ msgid "Exceptions"
+#~ msgstr "Excepciones"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Guardar el archivo actual con un nombre diferente"
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Guardara el mensaje a una carpeta especМfica"
+#~ msgid "Mail _to:"
+#~ msgstr "Enviar _a:"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Enviar"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _Later"
-msgstr "Enviar _mas tarde"
+#~ msgid "Modify"
+#~ msgstr "Modificar"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send _later"
-msgstr "Enviar _mas tarde"
+#~ msgid "No recurrence"
+#~ msgstr "Sin recurrencia"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the mail in HTML format"
-msgstr "Enviar el mensaje en formato HTML"
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message later"
-msgstr "Enviar el mensaje mАs tarde"
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vado"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send the message now"
-msgstr "Enviar el mensaje ahora"
+#~ msgid "Pu_blic"
+#~ msgstr "PЗ_blico"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Send this message now"
-msgstr "Enviar este mensaje ahora"
+#~ msgid "Recurrence"
+#~ msgstr "Recurrencia"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show / hide attachments"
-msgstr "Mostrar / ocultar adjuntos"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regla de recurrencia"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show _attachments"
-msgstr "Mostar _adjuntos"
+#~ msgid "Reminder"
+#~ msgstr "Recordatorio"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Show attachments"
-msgstr "Mostar adjuntos"
+#~ msgid "Simple recurrence"
+#~ msgstr "Recurrencia simple"
 
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "Sign this message with your PGP key"
-msgstr "Firmar este mensaje con tu clave PGP"
+#~ msgid "Su_mmary:"
+#~ msgstr "Resu_men:"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insert text file... (FIXME)"
+#~ msgid "Time"
+#~ msgstr "Hora"
 
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Open..."
-msgstr "_Abrir..."
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
 
-#: po/tmp/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Seguridad"
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
 
-#.
-#. * 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 "AЯadir carpeta a tu lista de carpeta suscritas"
+#~ msgid "_Contacts"
+#~ msgstr "_Contactos"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Regenerar la lista"
+#~ msgid "_Display"
+#~ msgstr "_Mostrar"
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Regenerar la lista de carpetas"
+#~ msgid "_End time:"
+#~ msgstr "Hora de _fin:"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Quitar carpetas de tu lista de carpetas suscritas"
+#~ msgid "_Mail"
+#~ msgstr "_Correo"
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Suscribir"
+#~ msgid "_Program"
+#~ msgstr "_Programa"
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Dessucribir"
+#~ msgid "_Run program:"
+#~ msgstr "Ejecuta_r programa:"
 
-#.
-#. * 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 una carpeta distinta"
+#~ msgid "_Start time:"
+#~ msgstr "Hora de _inicio:"
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "_Salir"
+#~ msgid "_Starting date:"
+#~ msgstr "Fecha de Ini_cio:"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atajos de Evolution"
+#~ msgid "day(s)"
+#~ msgstr "dМa(s)"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Salir del programa"
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Comenzando"
+#~ msgid "for"
+#~ msgstr "para"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Import an external file format"
-msgstr "Importar un formato de archivo externo"
+#~ msgid "forever"
+#~ msgstr "siempre"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show information about Evolution"
-msgstr "Mostrar informaciСn acerca de Evolution"
+#~ msgid "label21"
+#~ msgstr "label21"
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Folder Bar"
-msgstr "Mostrar la barra de _carpetas"
+#~ msgid "month(s)"
+#~ msgstr "mes(es)"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Show the _Shortcut Bar"
-msgstr "Mostrar la barra de _atajos"
+#~ msgid "until"
+#~ msgstr "hasta"
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit _Bug Report"
-msgstr "Enviar reporte de _fallo"
+#~ msgid "week(s)"
+#~ msgstr "semana(s)"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy."
-msgstr "Enviar un reporte de fallo usando Bug Buddy."
+#~ msgid "year(s)"
+#~ msgstr "aЯo(s)"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Toggle whether to show the folder bar"
-msgstr "Activar si se muestra la barra de carpetas"
+#~ msgid "Could not create a folder in `%s'"
+#~ msgstr "No puedo crear una carpeta en `%s'"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Activar si se muestra la barra de atajos"
+#~ msgid "April"
+#~ msgstr "Abril"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the C_ontact Manager"
-msgstr "Usando el administrador de c_ontactos"
+#~ msgid "August"
+#~ msgstr "Agosto"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Calendar"
-msgstr "Usando el _calendario"
+#~ msgid "December"
+#~ msgstr "Diciembre"
 
-#: po/tmp/evolution.xml.h:21
-msgid "Using the _Mailer"
-msgstr "Usando el _correo"
+#~ msgid "February"
+#~ msgstr "Febrero"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_About Evolution..."
-msgstr "_Acerca de Evolution..."
+#~ msgid "Go To Date"
+#~ msgstr "Ir a una fecha"
 
-#: po/tmp/evolution.xml.h:23
-msgid "_Appointment (FIXME)"
-msgstr "_Appointment (FIXME)"
+#~ msgid "Go To Today"
+#~ msgstr "Ir a hoy"
 
-#: po/tmp/evolution.xml.h:24
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#~ msgid "January"
+#~ msgstr "Enero"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Folder"
-msgstr "_Carpeta"
+#~ msgid "July"
+#~ msgstr "Julio"
 
-#: po/tmp/evolution.xml.h:28
-msgid "_Go to Folder..."
-msgstr "_Ir a la carpeta..."
+#~ msgid "June"
+#~ msgstr "Junio"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Import file..."
-msgstr "_Importar archivo..."
+#~ msgid "March"
+#~ msgstr "Marzo"
 
-#: po/tmp/evolution.xml.h:31
-msgid "_Index"
-msgstr "_Indexar"
+#~ msgid "May"
+#~ msgstr "Mayo"
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Mail message"
-msgstr "_Enviar mensaje"
+#~ msgid "November"
+#~ msgstr "Noviembre"
 
-#: po/tmp/evolution.xml.h:34
-msgid "_Settings"
-msgstr "_ConfiguraciСn"
+#~ msgid "October"
+#~ msgstr "Octubre"
 
-#: po/tmp/evolution.xml.h:35
-msgid "_Task (FIXME)"
-msgstr "_Task (FIXME)"
+#~ msgid "September"
+#~ msgstr "Septiembre"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
+#~ msgid "Attachment properties"
+#~ msgstr "Propiedades del adjunto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativa"
+#~ msgid "File name:"
+#~ msgstr "Nombre del fichero:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
+#~ msgid "MIME type:"
+#~ msgstr "Tipo MIME:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fuera de la oficina"
+#~ msgid "Edit VFolders"
+#~ msgstr "Editar carpeta virtual"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sin informaciСn"
+#~ msgid "Filter Rules"
+#~ msgstr "Reglas para los filtro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invitar a otros..."
+#~ msgid "Incoming"
+#~ msgstr "Entrando"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opciones"
+#~ msgid "Outgoing"
+#~ msgstr "Saliente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostrar _solo las horas de trabajo"
+#~ msgid "Virtual Folders"
+#~ msgstr "Carpetas virtuales"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Mostrar quitando _Zoom"
+#~ msgid "vFolder Sources"
+#~ msgstr "Fuentes de la carpeta virtual"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Actualizar Libre/Ocupado"
+#~ msgid "Current store format:"
+#~ msgstr "Formato de almacenamiento actual:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Mailbox Format"
+#~ msgstr "Formato Mailbox"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Auto seleccionar"
+#~ msgid "New store format:"
+#~ msgstr "Nuevo formato de almacenamiento:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr ""
+#~ "Nota: Cuando se convierte entre distintos tipos de formato, fallos\n"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Todas las personas y los recursos"
+#~ msgid "maildir"
+#~ msgstr "maildir"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Todas las _personas y un recurso"
+#~ msgid "mbox"
+#~ msgstr "mbox"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personas _requeridas"
+#~ msgid "mh"
+#~ msgstr "mh"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personas requeridas y _un recurso"
+#~ msgid "Account"
+#~ msgstr "Cuenta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de _inicio de la reuniСn:"
+#~ msgid "Account Information"
+#~ msgstr "InformaciСn de la cuenta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fin de la reuniСn:"
+#~ msgid "Account Management"
+#~ msgstr "GestiСn de la cuenta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Todos los participantes"
+#~ msgid "Account Properties"
+#~ msgstr "Propiedades de la cuenta"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Authentication"
+#~ msgstr "AutentificaciСn"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Authentication Type:"
+#~ msgstr "Tipo de autentificaciСn:"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Ahora"
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Enhorabuena, se ha completado la configuraciСn de su correo.\n"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Done"
+#~ msgstr "Hecho"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#~ msgid "E-Mail Address:"
+#~ msgstr "DirecciСn de correo:"
+
+#~ msgid "Email Address:"
+#~ msgstr "DirecciСn de correo:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraciСn del correo de Evolution"
+
+#~ msgid "Full Name:"
+#~ msgstr "Nombre completo:"
+
+#~ msgid "Hostname:"
+#~ msgstr "Nombre del servidor:"
+
+#~ msgid "Identity"
+#~ msgstr "Identidad"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Servidor del correo de entrada"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Dejar mensajes en el servidor"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "Correo"
+
+#~ msgid "Mail Account"
+#~ msgstr "Cuenta de correo"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraciСn del correo"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Ayudante para la configuraciСn del correo"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Hacer de esta mi cuenta predeterminada"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscelanea"
+
+#~ msgid "News"
+#~ msgstr "Noticias"
+
+#~ msgid "Optional"
+#~ msgstr "Opcional"
+
+#~ msgid "Organization:"
+#~ msgstr "OrganizaciСn:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Servidor de correo de salida"
+
+#~ msgid "Password:"
+#~ msgstr "Clave:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Texto plano"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Reciviendo mensajes"
+
+#~ msgid "Remember my password"
+#~ msgstr "Recuerda mi contraseЯa"
+
+#~ msgid "Required"
+#~ msgstr "Requerido"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Guardar clave"
+
+#~ msgid "Select signature file"
+#~ msgstr "Elegir archivo de firma"
+
+#~ msgid "Sending Email"
+#~ msgstr "Enviando correo"
+
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraciСn del servidor"
+
+#~ msgid "Server Type: "
+#~ msgstr "Tipo de servidor:"
+
+#~ msgid "Server requires authentication"
+#~ msgstr "El servidor requiere autentificaciСn"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid "Signature file:"
+#~ msgstr "Archivo de firma:"
+
+#~ msgid "Signature:"
+#~ msgstr "Firma:"
+
+#~ msgid "Sources"
+#~ msgstr "Fuentes"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Este servidor requiere una conexiСn segura (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Escriba el nombre por el cual le gustatМa referirse a estos servidores. Por "
+#~ "ejemplo: \"Trabajo\" o \"Casa\"."
+
+#~ msgid "User Information"
+#~ msgstr "InformaciСn del usuario"
+
+#~ msgid "Username:"
+#~ msgstr "Nombre:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Bienvenido al ayudante de configuraciСn de correo de Evolution.\n"
+
+#~ msgid " for "
+#~ msgstr " para "
+
+#~ msgid "Delete a contact"
+#~ msgstr "Borrar un contacto"
+
+#~ msgid "Find"
+#~ msgstr "Buscar"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "Print contacts"
+#~ msgstr "Imprimir contactos"
+
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Parar la carga"
+
+#~ msgid "View All"
+#~ msgstr "Ver todo"
+
+#~ msgid "View all contacts"
+#~ msgstr "Ver todos los contactos"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_ConfiguraciСn de la agenda de direcciones..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Im_primir contactos..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "Bu_scar contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 DМas"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alterar preferencias"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ca_lendario"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Preferencias del calendario..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crear una nueva cita"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Creando un nuevo calendario"
+
+#~ msgid "Day"
+#~ msgstr "DМa"
+
+#~ msgid "Go back in time"
+#~ msgstr "Volver en el tiempo"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Avanzar en el tiempo"
+
+#~ msgid "Go to"
+#~ msgstr "Ir a"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Ir a una fecha especМfica"
+
+#~ msgid "Go to present time"
+#~ msgstr "Ir al momento actual"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir un calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Previo"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Imprimir este calendario"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Guardar el calendario como otra cosa"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Mostrar 1 dМa"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Mostrar un mes"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Mostrar 1 semana"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostrar un semana laboral"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_New"
+#~ msgstr "_Nuevo"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir calendario"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Im_primir este calendario"
+
+#~ msgid "_Save As..."
+#~ msgstr "Guardar _como..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Borrar este elemento"
+
+#~ msgid "Delete..."
+#~ msgstr "Borrar..."
+
+#~ msgid "Help"
+#~ msgstr "Ayuda"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Imprimir ca_becera..."
+
+#~ msgid "Print this item"
+#~ msgstr "Imprimir esre elemento"
+
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Guardar _como..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Guardar y cerrar"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Guardar el contacto y cerar la ventana de diАlogo"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "E_nviar el contacto a otro..."
+
+#~ msgid "See online help"
+#~ msgstr "Ver la ayuda en lМnea"
+
+#~ msgid "_File"
+#~ msgstr "_Archivo"
+
+#~ msgid "_Print..."
+#~ msgstr "Im_primir..."
+
+#~ msgid "_Save"
+#~ msgstr "_Guardar"
+
+#~ msgid "About this application"
+#~ msgstr "Acerca de esta aplicaciСn"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpiar"
+
+#~ msgid "C_ut"
+#~ msgstr "C_ortar"
+
+#~ msgid "Clear"
+#~ msgstr "Limpiar"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Quitar la seleccionada"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Cerrar esta cita"
+
+#~ msgid "Copy"
+#~ msgstr "Copiar"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copiar la selecciСn"
+
+#~ msgid "Cut"
+#~ msgstr "Cortar"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Cortar la selecciСn"
+
+#~ msgid "Dump XML"
+#~ msgstr "Volcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Volcar la descripciСn XML de la IU"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Address _Book..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Chec_k Names"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Help"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: In_complete Task"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Insert File"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Rec_urrence..."
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "FIXME: what goes here?"
+
+#~ msgid "Find Again"
+#~ msgstr "Buscar de nuevo"
+
+#~ msgid "Find _Again"
+#~ msgstr "Buscar de _nuevo"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Propiedades las propiedades del archivo"
+
+#~ msgid "N_ext"
+#~ msgstr "Sigui_ente"
+
+#~ msgid "Paste"
+#~ msgstr "Pegar"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Pegar el contenido del portapapeles"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Configurar impr_esiСn..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Configurar impresiСn"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid "Redo"
+#~ msgstr "Rehacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Rehacer la accciСn deshecha"
+
+#~ msgid "Replace"
+#~ msgstr "Remplazar"
+
+#~ msgid "Replace a string"
+#~ msgstr "Remplazar una cadena"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Guardar la cita y cerrar la ventana de diАlogo"
+
+#~ msgid "Save the current file"
+#~ msgstr "Guardar archivo actual"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Concertar encuentro"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Concertar un _encuentro"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programas algЗn tipo de encuentro"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar de nuevo la misma cadena"
+
+#~ msgid "Search for a string"
+#~ msgstr "Buscar una cadena"
+
+#~ msgid "Select All"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Configurar los datos de la pАgina para la impresora actual"
+
+#~ msgid "Undo"
+#~ msgstr "Deshacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Deshacer la Зltima acciСn"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Close"
+#~ msgstr "_Cerrar"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "_Debug"
+#~ msgstr "_Depurar"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "_Find..."
+#~ msgstr "_Buscar..."
+
+#~ msgid "_Help"
+#~ msgstr "_Ayuda"
+
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
+
+#~ msgid "_Print"
+#~ msgstr "Im_primir"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propiedades..."
+
+#~ msgid "_Redo"
+#~ msgstr "_Rehacer"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Remplazar..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Deshacer"
+
+#~ msgid "Compose"
+#~ msgstr "Nuevo"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Escribir un nuevo mensaje"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar mensaje a una nueva carpeta"
+
+#~ msgid "Create Rule"
+#~ msgstr "Crear una regla"
+
+#~ msgid "F_older"
+#~ msgstr "_Carpetas"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrar segЗn el remitente"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtrar segЗn los dest_inatarios"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Olvidar _contraseЯa"
+
+#~ msgid "Get Mail"
+#~ msgstr "Obtener"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ocultar los mensajes _seleccionados"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Ocultar mensajes _borrados"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Ocultar mensajes _leidos"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtros de correo..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Administrar suscripciones..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_car como leМdo"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _no leМdo"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaje a una nueva carpeta"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Ver el mensaje que va a ser impreso"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vista previa del mensaje..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir el mensaje en la impresora"
+
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaje..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Re: _Todos"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Resp. _Remitente"
+
+#~ msgid "S_ource"
+#~ msgstr "F_uente"
+
+#~ msgid "Select _All"
+#~ msgstr "Seleccionar _todo"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Enviar el correo en la cola y obtener el nuevo"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Mostrar _todos los mensajes"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Lista de mensajes encadenados"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VFolder segЗn el _remitente"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VFolder segЗn los _destinatarios"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver las fuentes del mensaje"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplicar filtro"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copiar a la carpeta..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Editar mensaje"
+
+#~ msgid "_Expunge"
+#~ msgstr "_Comprimir"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrar segЗn el asunto"
+
+#~ msgid "_Forward"
+#~ msgstr "_Reenviar"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Invertir selecciСn"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_ConfiguraciСn del correo..."
+
+#~ msgid "_Message"
+#~ msgstr "_Mensaje"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Mover a la carpeta..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Abrir en una nueva ventana"
+
+#~ msgid "_Print Message"
+#~ msgstr "Im_primir mensaje"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Guardar mensaje como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Encadenados"
+
+#~ msgid "_Undelete"
+#~ msgstr "_Recuperar"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VFolder segЗn el asunto"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Editor de carpetas _virtuales..."
+
+#~ msgid "Attach"
+#~ msgstr "Adjuntar"
+
+#~ msgid "Close the current file"
+#~ msgstr "Cerrar el archivo actual"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Encriptar este mensaje con PGP"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insertar un archivo como textp en el mensaje"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Insertar un archivo de texto..."
+
+#~ msgid "Open a file"
+#~ msgstr "Abrir un archivo"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Encriptar con PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Firmar con PGP"
+
+#~ msgid "Save As"
+#~ msgstr "Guardar como"
+
+#~ msgid "Save _Draft"
+#~ msgstr "Guardar _Borrador"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Save in _folder... (FIXME)"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Guardar en carpeta..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Guardar el archivo actual con un nombre diferente"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Guardara el mensaje a una carpeta especМfica"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "Send _Later"
+#~ msgstr "Enviar _mas tarde"
+
+#~ msgid "Send _later"
+#~ msgstr "Enviar _mas tarde"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Enviar el mensaje en formato HTML"
+
+#~ msgid "Send the message later"
+#~ msgstr "Enviar el mensaje mАs tarde"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar el mensaje ahora"
+
+#~ msgid "Send this message now"
+#~ msgstr "Enviar este mensaje ahora"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Mostrar / ocultar adjuntos"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Mostar _adjuntos"
+
+#~ msgid "Show attachments"
+#~ msgstr "Mostar adjuntos"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Firmar este mensaje con tu clave PGP"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insert text file... (FIXME)"
+
+#~ msgid "_Open..."
+#~ msgstr "_Abrir..."
+
+#~ msgid "_Security"
+#~ msgstr "_Seguridad"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "AЯadir carpeta a tu lista de carpeta suscritas"
+
+#~ msgid "Refresh List"
+#~ msgstr "Regenerar la lista"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Regenerar la lista de carpetas"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Quitar carpetas de tu lista de carpetas suscritas"
+
+#~ msgid "Subscribe"
+#~ msgstr "Suscribir"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Dessucribir"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Mostrar una carpeta distinta"
+
+#~ msgid "E_xit"
+#~ msgstr "_Salir"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _atajos de Evolution"
+
+#~ msgid "Exit the program"
+#~ msgstr "Salir del programa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Comenzando"
+
+#~ msgid "Import an external file format"
+#~ msgstr "Importar un formato de archivo externo"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Mostrar informaciСn acerca de Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostrar la barra de _carpetas"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Mostrar la barra de _atajos"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Enviar reporte de _fallo"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Enviar un reporte de fallo usando Bug Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Activar si se muestra la barra de carpetas"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Activar si se muestra la barra de atajos"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Usando el administrador de c_ontactos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Usando el _calendario"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Usando el _correo"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Acerca de Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Appointment (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Carpeta"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Ir a la carpeta..."
+
+#~ msgid "_Import file..."
+#~ msgstr "_Importar archivo..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indexar"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Enviar mensaje"
+
+#~ msgid "_Settings"
+#~ msgstr "_ConfiguraciСn"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Task (FIXME)"
 
 #~ msgid "Server disconnected."
 #~ msgstr "Servidor desconectado."
diff --git a/po/fi.po b/po/fi.po
index 30de9eeb17..c45c0d4cdd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-06 16:38+0000\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,11 +14,183 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Viestin lДhettДminen epДonnistui: %s"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "LДhetetДДn sДhkЖpostia"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "_Sulje"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "SiirrД kansioon"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Siirry edelliseen kohtaan"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Siirry seuraavaan kohtaan"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Tiedostoa %s ei voitu avata:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "VIrhe luettaessa viestitiedostoa: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Ei virhettД"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Koeyhteys epДonnistui: \"%s\""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Uusi"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Luo uusi kontakti"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,37 +198,37 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -64,7 +236,7 @@ msgstr ""
 "\n"
 "SyntymДpДivД: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -72,19 +244,19 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -92,7 +264,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -100,13 +272,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -114,7 +286,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -122,25 +294,25 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -148,7 +320,7 @@ msgstr ""
 "\n"
 "SДhkЖposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -156,13 +328,13 @@ msgstr ""
 "\n"
 "SДhkЖposti:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -170,13 +342,13 @@ msgstr ""
 "\n"
 "AikavyЖhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -184,13 +356,13 @@ msgstr ""
 "\n"
 "TyЖn kuvaus:   "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -198,31 +370,31 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -230,7 +402,7 @@ msgstr ""
 "\n"
 "Kategoriat: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -246,13 +418,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -260,17 +432,6 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -386,40 +547,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 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 "Poista kontakti?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -429,7 +582,7 @@ msgid "_Add"
 msgstr "_LisДД"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -442,14 +595,7 @@ msgstr "Puhelintyypit"
 msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
-#.
-#. * 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/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config-druid.glade.h:10
-#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "LisДД"
 
@@ -507,7 +653,6 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegoriat"
 
@@ -524,7 +669,6 @@ msgid "_Address..."
 msgstr "_Osoite..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config-druid.glade.h:32
 msgid "General"
 msgstr ""
 
@@ -569,24 +713,27 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Yksityiskohdat"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "TyЖ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "TyЖ 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -595,6 +742,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Auto"
 
@@ -604,28 +752,33 @@ msgstr "Yritys"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Koti"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Koti 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Muu"
 
@@ -634,10 +787,12 @@ msgid "Other Fax"
 msgstr "Muu faksi"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr ""
 
@@ -654,62 +809,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "SДhkЖposti 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "SДhkЖposti 3"
 
 #.
-#. * 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 "Osoite _2:"
-
-#: po/tmp/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Tarkista osoite"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "M_aa:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Suomi"
-
-#: po/tmp/fulladdr.glade.h:11
-msgid "USA"
-msgstr "Yhdysvallat"
-
-#: po/tmp/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Osoite:"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Kaupunki:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Osavaltio/Provinssi:"
-
-#: 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.
@@ -763,12 +872,7 @@ msgstr ""
 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:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -793,27 +897,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "NДytД kaikki"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -838,9 +942,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Salasana"
 
@@ -873,12 +977,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config-druid.glade.h:33
 msgid "Host:"
 msgstr "IsДntД:"
 
@@ -895,12 +997,10 @@ msgid "Search Scope:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943 po/tmp/mail-config-druid.glade.h:14
 msgid "Authentication:"
 msgstr "Todentaminen:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934 po/tmp/mail-config-druid.glade.h:51
 msgid "Path:"
 msgstr "Polku:"
 
@@ -921,371 +1021,94 @@ msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
-"Valitse osoitekirjan tyyppi, ja anna sen jДlkeen tarpeelliset tiedot "
-"siitД."
+"Valitse osoitekirjan tyyppi, ja anna sen jДlkeen tarpeelliset tiedot siitД."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config-druid.glade.h:44
 msgid "Name:"
 msgstr "Nimi:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:685 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: 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-druid.glade.h:25 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "Poista"
-
-#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config-druid.glade.h:28
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Nimi"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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 "Etsi..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Vastaanottajat"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Valitse nimet"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-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.
-#. * 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"
-
-#: 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:451
+#: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
-msgid "Save in addressbook"
-msgstr "Tallenna osoitekirjaan"
-
-#: 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 "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 ""
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr ""
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Ala:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Mitat:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Kirjasin..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Kirjasinlajit"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Alatunniste:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr ""
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "YlДtunniste:"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Nimi"
 
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "YlД-/Alatunniste"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "SДhkЖposti 2"
 
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisaatio"
 
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Korkeus:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_Osasto:"
 
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Vaaka"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Vasen:"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "Tiedosto"
 
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Reunukset"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Sarakkeiden mДДrД:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Asetukset"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Suunta"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Sivu"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Sivun asetukset:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Paperi"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "PaperilДhde:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Pysty"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Esikatselu:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Peilikuvareunukset"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Kutsumanimi:"
 
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Oikea:"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "LДhde"
 
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Varjostus"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Koko:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Tyylin nimi:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "YlД:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config-druid.glade.h:74
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Leveys:"
+#: addressbook/gui/widgets/e-minicard-control.c:280
+msgid "Save in addressbook"
+msgstr "Tallenna osoitekirjaan"
 
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
+#: addressbook/gui/widgets/e-minicard-view.c:129
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
 msgstr ""
 
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
@@ -1296,13 +1119,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1314,30 +1137,46 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+#, fuzzy
+msgid "Reminder of your appointment at "
+msgstr "Muistuta kaikista tapaamisista"
+
+#: calendar/gui/alarm-notify.c:876
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Avaa kalenteri"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Tallenna kalenteri"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1345,57 +1184,57 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:326 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:329 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:332 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1404,7 +1243,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1412,765 +1251,429 @@ 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:845
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:848
+#: calendar/gui/calendar-model.c:896
 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:852
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1103
 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
-msgid "Edit appointment"
-msgstr "Muokkaa tapaamista"
-
-#: 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 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 minuuttia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minuuttia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 tuntia (am/pm)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minuuttia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 tuntia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minuuttia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minuuttia"
-
-#: 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 "Kalenteri"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Kalenterin asetukset"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "VДrit"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "TiivistД viikonloput"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Oletukset"
-
-#: 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 "PДivДn loppu:"
-
-#: 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 "Pe"
-
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "Perjantai"
-
-#: 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"
+#: calendar/gui/calendar-summary.c:97
+msgid "%A, %e %B %Y"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Ma"
-
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
-msgid "Monday"
-msgstr "Maanantai"
-
-#: 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 "Valitse vДri"
-
-#: filter/libfilter-i18n.h:31 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "Prioriteetti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Muistuta kaikista tapaamisista"
+#: calendar/gui/calendar-summary.c:302
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
+#: calendar/gui/calendar-summary.c:314
+msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "La"
-
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "Lauantai"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "NДytД"
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "PДivД"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
 msgstr "NДytД tapaamisten lopetusajat"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "NДytД viikkonumerot"
-
-#: 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/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "Su"
-
-#: calendar/gui/event-editor.c:440 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/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "To"
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "NДytД liitteet"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "Torstai"
+#: calendar/gui/calendar-summary.c:583
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Tulosta kalenteri"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Ti"
-
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Ke"
-
-#: calendar/gui/event-editor.c:436 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"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minuuttia niitД ennen."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "sekuntia."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Haluatko todella poistaa tДmДn nimettЖmДn tapaamisen?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Haluatko todella poistaa tДmДn nimettЖmДn tehtДvДn?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 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 "_Luokitus"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Peruutettu"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Korkea"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
 
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Matala"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config-druid.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Tavallinen"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
 msgstr ""
+"\n"
+"Kategoriat: "
 
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "TehtДvД"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Kontaktit..."
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Prioriteetti:"
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "_Loppumisaika:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "_Alkamisaika:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioriteetti"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
-#, c-format
-msgid "Task - %s"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "_Yhteenveto:"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3273
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Poista"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Muokkaa tДtД tapaamista..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Poista tДmД tapaaminen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Tee tДstД tapaamisesta siirrettДvД"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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 "_Koko pДivДn kestДvД tapahtuma"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "PДivДД"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Joka"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Poikkeukset"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Tuntia"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minuuttia"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "Muuta"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Y_ksityinen"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "Y_leinen"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "_Yhteenveto:"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Aika"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Kontaktit"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "_Loppumisaika:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
 msgstr ""
+"\n"
+"Kategoriat: "
 
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr ""
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "_AlkamispДivД:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Viestin lДhettДminen epДonnistui: %s"
 
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr ""
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "pДivД"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Maanantai"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr ""
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Tiistai"
 
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Keskiviikko"
 
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Torstai"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Perjantai"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr ""
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Lauantai"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "pДivД"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Sunnuntai"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:838
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3096 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
 msgstr ""
+"Tiedostoa %s ei voitu avata:\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "Could not create a calendar in `%s'"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Su"
+
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Ma"
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Ti"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ke"
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "To"
+
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Pe"
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "La"
+
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
@@ -2362,10 +1865,14 @@ msgstr ""
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2456,61 +1963,69 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Peruutettu"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Avaa kalenteri"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2519,17 +2034,17 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2545,40 +2060,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epДonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2590,25 +2106,25 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa kДyttДen."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr "Ota yhteys IMAP-palvelimeen Kerberos 4 -todentamista kДyttДen."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2616,13 +2132,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2630,7 +2146,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2638,7 +2154,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -2780,7 +2296,8 @@ msgstr ""
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
-msgstr "Viestin %s hakeminen kansiosta %s epДonnistui\n"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epДonnistui\n"
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:366
@@ -2960,8 +2477,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -2990,71 +2507,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(tuntematon)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config-druid.glade.h:62
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3106,123 +2622,120 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "Todentamista ei vaadita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: po/tmp/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "TДmД valinta yhdistДД SMTP-palvelimeen kДyttДen CRAM-MD5 "
-"-todentamista."
+msgstr ""
+"TДmД valinta yhdistДД SMTP-palvelimeen kДyttДen CRAM-MD5 -todentamista."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
-msgstr "ViestiД ei voida lДhettДД: lДhettДjДn osoitetta ei ole"
-" mДДritelty"
+msgstr "ViestiД ei voida lДhettДД: lДhettДjДn osoitetta ei ole mДДritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "ViestiД ei voida lДhettДД: lДhettДjДn osoite on epДkelpo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "ViestiД ei voida lДhettДД: vastaanottajia ei ole mДДritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3265,12 +2778,11 @@ msgid "attachment"
 msgstr "liite"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "LiitД tiedosto"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Poista"
 
@@ -3286,66 +2798,50 @@ msgstr "LisДД liite..."
 msgid "Attach a file to the message"
 msgstr "LisДД viestiin liitetiedoston"
 
-#.
-#. * 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 ""
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Tiedostonimi:"
-
-#: 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:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "LДhettДjД:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Anna sДhkЖpostin aihe"
 
@@ -3356,38 +2852,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Tallenna nimellД..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Tallennetaan muutokset..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3397,27 +2893,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epДonnistui."
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3425,26 +2921,22 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittДД sen?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "vuosi"
@@ -3569,7 +3061,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3666,186 +3158,167 @@ msgstr ""
 msgid "Read"
 msgstr "Lue"
 
-#: 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 "Tulevat"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "LДhtevДt"
-
-#: 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 "after"
-msgstr "jДlkeen"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "ennen"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "sisДltДД"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "LДhetetty"
 
+#: 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 "does not contain"
-msgstr "ei sisДllД"
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr ""
+msgid "Message was received"
+msgstr "Viesti vastaanotettu"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr ""
+msgid "Message was sent"
+msgstr "Viesti lДhetetty"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+msgid "Move to Folder"
+msgstr "SiirrД kansioon"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr ""
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr ""
+msgid "Sender"
+msgstr "LДhettДjД"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "on"
+msgid "Source"
+msgstr "LДhde"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "on suurempi kuin"
+msgid "Specific header"
+msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "on pienempi kuin"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Tila"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
+msgid "Stop Processing"
 msgstr ""
 
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Aihe"
+
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Viestin otsikko"
+msgid "after"
+msgstr "jДlkeen"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Viesti vastaanotettu"
+msgid "before"
+msgstr "ennen"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Viesti lДhetetty"
+msgid "contains"
+msgstr "sisДltДД"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "SiirrД kansioon"
+msgid "does not contain"
+msgstr "ei sisДllД"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Vastaanottajat"
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "LДhettДjД"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr ""
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "LДhde"
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr ""
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Tila"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Aihe"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3863,10 +3336,6 @@ msgstr "LisДД sДДntЖ"
 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 ""
@@ -3875,171 +3344,161 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Tallenna"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
+msgstr ""
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Aihe sisДltДД"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Aihe ei sisДllД"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "NДytД kaikki piilotetut"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Piilota valitut"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Piilota luetut"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Piilota poistetut"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Piilota aihe"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Avaa"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Tallenna nimellД..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Vastaa lДhettДjДlle"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "SiirrД kansioon..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "Piilota viestit"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Piilota aihe \"%s\""
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr ""
 
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Oletus"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+msgid "Evolution Account Editor"
 msgstr ""
 
 #: mail/mail-autofilter.c:71
@@ -4062,7 +3521,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4070,31 +3529,27 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4102,24 +3557,28 @@ msgstr ""
 "ViestillД ei ole aihetta.\n"
 "LДhetetДДnkЖ toedella?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr "LДhettДДksesi tДmДn viestin sinuun tulee mДДrittДД vastaanottajat"
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
-msgstr "LДhettДДksesi tДmДn viestin sinuun tulee mДДrittДД "
-"vastaanottajat"
+msgstr "LДhettДДksesi tДmДn viestin sinuun tulee mДДrittДД vastaanottajat"
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "SiirrД viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4127,448 +3586,58 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellД..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellД..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epДonnistui"
 
-#.
-#. * 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 "Account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:9
-msgid "Account Properties"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr "Todentaminen"
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr "Todentamistyyppi:"
-
-#: po/tmp/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:24
-msgid "Default"
-msgstr "Oletus"
-
-#: po/tmp/mail-config-druid.glade.h:26
-msgid "Done"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:27
-msgid "E-Mail Address:"
-msgstr "SДhkЖpostiosoite:"
-
-#: po/tmp/mail-config-druid.glade.h:29
-msgid "Email Address:"
-msgstr "SДhkЖpostiosoite:"
-
-#: po/tmp/mail-config-druid.glade.h:30
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:31
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: po/tmp/mail-config-druid.glade.h:34
-msgid "Hostname:"
-msgstr "IsДnnДn nimi:"
-
-#: po/tmp/mail-config-druid.glade.h:35
-msgid "Identity"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:36
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:37
-msgid "Keep mail on server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:38
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config-druid.glade.h:39
-msgid "Mail"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:40
-msgid "Mail Account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:41
-msgid "Mail Configuration"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:42
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:43
-msgid "Make this my default account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:45
-msgid "News"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:47
-msgid "Optional"
-msgstr ""
-
-#: mail/mail-config-gui.c:485 po/tmp/mail-config-druid.glade.h:48
-msgid "Organization:"
-msgstr "Organisaatio:"
-
-#: po/tmp/mail-config-druid.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:50
-msgid "Password:"
-msgstr "Salasana:"
-
-#: po/tmp/mail-config-druid.glade.h:52
-msgid "Plain Text"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:53
-msgid "Receiving Email"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:54
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-format.c:628 po/tmp/mail-config-druid.glade.h:55
-msgid "Reply-To:"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:56
-msgid "Reply-to:"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:57
-msgid "Required"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config-druid.glade.h:59
-msgid "Save password"
-msgstr "Tallenna salasana"
-
-#: po/tmp/mail-config-druid.glade.h:60
-msgid "Select signature file"
-msgstr "Valitse allekirjoitustiedosto"
-
-#: po/tmp/mail-config-druid.glade.h:61
-msgid "Sending Email"
-msgstr "LДhetetДДn sДhkЖpostia"
-
-#: po/tmp/mail-config-druid.glade.h:63
-msgid "Server Configuration"
-msgstr "Palvelimen asetukset"
-
-#: po/tmp/mail-config-druid.glade.h:64
-msgid "Server Timeouts"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:65
-msgid "Server Type: "
-msgstr "Palvelintyyppi: "
-
-#: po/tmp/mail-config-druid.glade.h:66
-msgid "Server requires authentication"
-msgstr "Palvelin vaati todennuksen"
-
-#: po/tmp/mail-config-druid.glade.h:67
-msgid "Servers"
-msgstr "Palvelimet"
-
-#: mail/mail-config-gui.c:496 po/tmp/mail-config-druid.glade.h:68
-msgid "Signature file:"
-msgstr "Allekirjoitustiedosto:"
-
-#: po/tmp/mail-config-druid.glade.h:69
-msgid "Signature:"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:70 po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "LДhteet"
-
-#: po/tmp/mail-config-druid.glade.h:71
-msgid "This server requires a secure connection (SSL)"
-msgstr "TДmД palvelin vaatii turvatun yhteyden (SSL)"
-
-#: po/tmp/mail-config-druid.glade.h:72
-msgid "Type"
-msgstr "Tyyppi"
-
-#: po/tmp/mail-config-druid.glade.h:73
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Anna nimi jolla haluat viitata nДihin palvelimiin. Esimerkiksi "
-"\"TyЖ\" tai \"Koti\"."
-
-#: po/tmp/mail-config-druid.glade.h:75
-msgid "User Information"
-msgstr "KДyttДjДtiedot"
-
-#: mail/mail-config-gui.c:928 po/tmp/mail-config-druid.glade.h:76
-msgid "Username:"
-msgstr "KДyttДjДnimi:"
-
-#: po/tmp/mail-config-druid.glade.h:77
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:80
-msgid "minute(s)"
-msgstr "minuutti(a)"
-
-#: 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 ""
-"Anna nimi ja sДhkЖpostiosoite, joita kДytetДДn lДhtevДssД postissa. Voit "
-"myЖs halutessasi antaa organisaatiosi nimen, sekД tiedostonimen, josta "
-"allekirjoituksesi luetaan."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Koko nimi:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "SДhkЖpostiosoite:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Allekirjoitustiedosto"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Etsi tuettuja tyyppejД..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "дlД poista viestejД palvelimelta"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Kokeile asetuksia"
-
-#: 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"
-"\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"
-"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 "LisДД lДhde"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Muokkaa lДhdettД"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "LisДД uutispalvelin"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Muokkaa uutispalvelinta"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Kokeillaan: \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Koeyhteys epДonnistui: \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "YhdistДminen onnistui!"
-
-#: mail/mail-config-gui.c:2346
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Querying authorization capabilities of \"%s\""
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Address"
-msgstr "Osoite"
-
-#: 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:12
-msgid "Mail Transport"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Merkitse viesti nДhdyksi [ms]: "
-
-#: po/tmp/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Uutispalvelimet"
-
-#: po/tmp/mail-config.glade.h:15
-msgid "News Sources"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organisaatio"
-
-#: po/tmp/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "LДhetД viestit HTML-muodossa"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Anna PGP/GPG-salasanasi"
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Ei salasanaa."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-ohjelmaa ei ole."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "VДliaikaistiedostoa ei voitu luoda: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -4605,65 +3674,65 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "TДssД Evolutionin versiossa ei ole GPG/PGP-tukea."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4719,162 +3788,181 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "SiirretДДn"
+
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "LДhetetДДn \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "LДhetetДДn viestiД"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "SiirretДДn viestejД \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopioidaan viestejД \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "SiirrД viestejД kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopioi viestejД kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "SiirretДДn"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(ei kuvausta)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiД %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Haetaan viestejД"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Tallennetaan viestejД"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -4882,14 +3970,10 @@ msgid ""
 msgstr ""
 
 #: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -4991,111 +4075,190 @@ msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Poista tДmД viesti"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "liite"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "LДhettДjД:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "jДlkeen"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Otettu vastaan"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Vastaanottaja:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Koko:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Anna PGP/GPG-salasanasi"
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Anna PGP/GPG-salasanasi"
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "GPG/PGP-ohjelmaa ei ole."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Ei salasanaa."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "VДliaikaistiedostoa ei voitu luoda: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "_Kansio"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "LДhde"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5190,30 +4353,31 @@ msgstr ""
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(NimetЖn)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 msgid "Go to folder..."
 msgstr ""
 
@@ -5221,13 +4385,18 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1100
 #, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s [%s]"
 msgstr ""
 
 #: shell/e-shell.c:372
@@ -5235,73 +4404,81 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "RyhmДn nimi:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Uusi ryhmД..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktivoi"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5309,13 +4486,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_NДytД"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr ""
 
@@ -5409,1238 +4584,1274 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Luo uusi kontakti"
-
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Poista kontakti"
-
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Etsi"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Uusi tapaaminen"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Etsi kontakti"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Uusi"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Tulosta kontaktit"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "_Kontakti"
 
-#: po/tmp/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "PysДytД"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "PysДytД lataaminen"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "NДytД kaikki"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "NДytД kaikki kontaktit"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Tulosta kontaktit..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Etsi kontakteja"
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_TyЖkalut"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "_LДhetД"
 
-#.
-#. * 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 pДivДД"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "Tallenna L_iitteet..."
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Muuta asetuksia"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "_SiirrД kansioon..."
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "_Kalenteri"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "_Kopioi kansioon..."
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Kalenterin asetukset..."
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Sivun asetukset:"
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "Tulostuksen _esikatselu"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Luo uusi kalenteri"
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "_Tiedosto..."
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "PДivД"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Merkitse lukemattomaksi"
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Kuukausi"
-
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Avaa kalenteri"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "_Kontakti"
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Tulosta tДmД kalenteri"
-
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Edellinen"
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "NДytД 1 pДivД"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "_Seuraava"
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "NДytД 1 kuukausi"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_TyЖkalupalkit"
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "NДytД 1 viikko"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "_Tiedosto..."
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "NДytД tyЖviikko"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Viikko"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "_Kirjasin..."
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
-msgid "_New"
-msgstr "_Uusi"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Avaa kalenteri"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Tulosta tДmД kalenteri"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "Tallenna _nimellД..."
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Poista..."
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Apua"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-msgid "Print this item"
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Kontakti"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: 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:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Kontakti"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "LДhetД _viesti kontaktille..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Tallenna _nimellД..."
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Kontakti"
 
-#: 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:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Tiedosto..."
 
-#: 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:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "_Kontakti"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-msgid "See online help"
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "_Kopioi kansioon..."
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "LДhetД _viesti kontaktille..."
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "_LДhetД"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
-msgid "_File"
-msgstr "_Tiedosto"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "T_ulosta..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Tallenna"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Li_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"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Tietoja..."
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_TyЖkalut"
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "T_oiminnot"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr ""
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Edellinen"
+
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Siirry edelliseen kohtaan"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "L_eikkaa"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "Apua"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Siirry seuraavaan kohtaan"
+
+#. 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:2471
+msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Sulje tДmД tapaaminen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopioi"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Leikkaa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Asetukset"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "_Kopioi kansioon..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "Apua"
-
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "Tulostuksen _esikatselu"
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Nyt"
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "_LДhetД"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "Tallenna L_iitteet..."
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "RyhmД %i"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#~ msgid "Delete Contact?"
+#~ msgstr "Poista kontakti?"
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Address _2:"
+#~ msgstr "Osoite _2:"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "_Kontakti"
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#~ msgid "Check Address"
+#~ msgstr "Tarkista osoite"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "_Tiedosto..."
+#~ msgid "Countr_y:"
+#~ msgstr "M_aa:"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "_Kirjasin..."
+#~ msgid "Finland"
+#~ msgstr "Suomi"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
+#~ msgid "USA"
+#~ msgstr "Yhdysvallat"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#~ msgid "_Address:"
+#~ msgstr "_Osoite:"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr ""
+#~ msgid "_City:"
+#~ msgstr "_Kaupunki:"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#~ msgid "_State/Province:"
+#~ msgstr "_Osavaltio/Provinssi:"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr ""
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "Etsi..."
 
-#: po/tmp/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "_SiirrД kansioon..."
+#~ msgid "Message Recipients"
+#~ msgstr "Vastaanottajat"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "_Uusi tapaaminen"
+#~ msgid "Select Names"
+#~ msgstr "Valitse nimet"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr ""
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr ""
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Etsi uudelleen"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Etsi uude_lleen"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Siirry seuraavaan kohtaan"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Siirry edelliseen kohtaan"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr ""
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "_Seuraava"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "LiitД"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "LiitД leikepЖytД"
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Edellinen"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Edellinen"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Tulost_usasetukset"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Tulostusasetukset"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr ""
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Tee uudelleen"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Tee kumottu toiminto uudelleen"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Korvaa"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Korvaa merkkijono"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Tallenna nykyinen tiedosto"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#~ msgid "Bottom:"
+#~ msgstr "Ala:"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "Dimensions:"
+#~ msgstr "Mitat:"
 
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Etsi uudelleen samaa merkkijonoa"
+#~ msgid "Font..."
+#~ msgstr "Kirjasin..."
 
-#: po/tmp/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Etsi merkkijonoa"
+#~ msgid "Fonts"
+#~ msgstr "Kirjasinlajit"
 
-#: po/tmp/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Valitse kaikki"
+#~ msgid "Footer:"
+#~ msgstr "Alatunniste:"
 
-#: po/tmp/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Merkitsee kaikki valituksi"
+#~ msgid "Header"
+#~ msgstr "YlДtunniste:"
 
-#: po/tmp/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+#~ msgid "Header/Footer"
+#~ msgstr "YlД-/Alatunniste"
 
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Kumoa"
+#~ msgid "Height:"
+#~ msgstr "Korkeus:"
 
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Kumoa edellinen toiminto"
+#~ msgid "Landscape"
+#~ msgstr "Vaaka"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_Tietoja..."
+#~ msgid "Left:"
+#~ msgstr "Vasen:"
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Sulje"
+#~ msgid "Margins"
+#~ msgstr "Reunukset"
 
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Kopioi"
+#~ msgid "Number of columns:"
+#~ msgstr "Sarakkeiden mДДrД:"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "Options"
+#~ msgstr "Asetukset"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Muokkaa"
+#~ msgid "Orientation"
+#~ msgstr "Suunta"
 
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Etsi..."
+#~ msgid "Page"
+#~ msgstr "Sivu"
 
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr ""
+#~ msgid "Paper"
+#~ msgstr "Paperi"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Apua"
+#~ msgid "Paper source:"
+#~ msgstr "PaperilДhde:"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "Li_sДД"
+#~ msgid "Portrait"
+#~ msgstr "Pysty"
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr ""
+#~ msgid "Preview:"
+#~ msgstr "Esikatselu:"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "L_iitД"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Peilikuvareunukset"
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Tulosta"
+#~ msgid "Right:"
+#~ msgstr "Oikea:"
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr ""
+#~ msgid "Shading"
+#~ msgstr "Varjostus"
 
-#: po/tmp/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
+#~ msgid "Style name:"
+#~ msgstr "Tyylin nimi:"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Korvaa..."
+#~ msgid "Top:"
+#~ msgstr "YlД:"
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_TyЖkalupalkit"
+#~ msgid "Type:"
+#~ msgstr "Tyyppi:"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr ""
+#~ msgid "Width:"
+#~ msgstr "Leveys:"
 
-#.
-#. * 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 ""
+#~ msgid "Edit appointment"
+#~ msgstr "Muokkaa tapaamista"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr ""
+#~ msgid "05 minutes"
+#~ msgstr "05 minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr ""
+#~ msgid "10 minutes"
+#~ msgstr "10 minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr ""
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 tuntia (am/pm)"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#~ msgid "15 minutes"
+#~ msgstr "15 minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#~ msgid "24 hour"
+#~ msgstr "24 tuntia"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
+#~ msgid "30 minutes"
+#~ msgstr "30 minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr ""
+#~ msgid "60 minutes"
+#~ msgstr "60 minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr "Piilota _poistetut viestit"
+#~ msgid "Calendar"
+#~ msgstr "Kalenteri"
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Piilota _luetut viestit"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalenterin asetukset"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "Piilota _valitut viestit"
+#~ msgid "Colors"
+#~ msgstr "VДrit"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr ""
+#~ msgid "Compress weekends"
+#~ msgstr "TiivistД viikonloput"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
+#~ msgid "Defaults"
+#~ msgstr "Oletukset"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#~ msgid "End of day:"
+#~ msgstr "PДivДn loppu:"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Merkitse _lukemattomaksi"
+#~ msgid "Pick a color"
+#~ msgstr "Valitse vДri"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "SiirrД"
+#~ msgid "Show"
+#~ msgstr "NДytД"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr ""
+#~ msgid "Show week numbers"
+#~ msgstr "NДytД viikkonumerot"
 
-#: po/tmp/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Esikatsele tulostettavaa viestiД"
+#~ msgid "Start of day:"
+#~ msgstr "PДivДn alku:"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Viestin tulostuksen esikatselu..."
+#~ msgid "Work week"
+#~ msgstr "TyЖviikko"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#~ msgid "minutes before they occur."
+#~ msgstr "minuuttia niitД ennen."
 
-#: po/tmp/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Tulosta viesti..."
+#~ msgid "seconds."
+#~ msgstr "sekuntia."
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Vastaa _Kaikille"
+#~ msgid "C_lassification:"
+#~ msgstr "_Luokitus"
 
-#: po/tmp/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Vastaa _LДhettДjДlle"
+#~ msgid "High"
+#~ msgstr "Korkea"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#~ msgid "Low"
+#~ msgstr "Matala"
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#~ msgid "Normal"
+#~ msgstr "Tavallinen"
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr "NДytД _kaikki viestit"
+#~ msgid "Task"
+#~ msgstr "TehtДvД"
 
-#: po/tmp/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontaktit..."
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#~ msgid "_Priority:"
+#~ msgstr "_Prioriteetti:"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#~ msgid "A_ll day event"
+#~ msgstr "_Koko pДivДn kestДvД tapahtuma"
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#~ msgid "Days"
+#~ msgstr "PДivДД"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
+#~ msgid "Every"
+#~ msgstr "Joka"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr ""
+#~ msgid "Exceptions"
+#~ msgstr "Poikkeukset"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "_Kopioi kansioon..."
+#~ msgid "Hours"
+#~ msgstr "Tuntia"
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Muokkaa viestiД"
+#~ msgid "Minutes"
+#~ msgstr "Minuuttia"
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
+#~ msgid "Modify"
+#~ msgstr "Muuta"
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
+#~ msgid "Pri_vate"
+#~ msgstr "Y_ksityinen"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr ""
+#~ msgid "Pu_blic"
+#~ msgstr "Y_leinen"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#~ msgid "Time"
+#~ msgstr "Aika"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr ""
+#~ msgid "_Confidential"
+#~ msgstr "_Luottamuksellinen"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Viesti"
+#~ msgid "_Contacts"
+#~ msgstr "_Kontaktit"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "_SiirrД kansioon..."
+#~ msgid "_Starting date:"
+#~ msgstr "_AlkamispДivД:"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
+#~ msgid "File name:"
+#~ msgstr "Tiedostonimi:"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Tulosta viesti"
+#~ msgid "Incoming"
+#~ msgstr "Tulevat"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "Tallenna _viesti nimellД..."
+#~ msgid "Outgoing"
+#~ msgstr "LДhtevДt"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr ""
+#~ msgid "Save"
+#~ msgstr "Tallenna"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#~ msgid "Show all hidden"
+#~ msgstr "NДytД kaikki piilotetut"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Palauta"
+#~ msgid "Hide selected"
+#~ msgstr "Piilota valitut"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#~ msgid "Hide read"
+#~ msgstr "Piilota luetut"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr ""
+#~ msgid "Hide deleted"
+#~ msgstr "Piilota poistetut"
 
-#.
-#. * 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 "LiitД"
+#~ msgid "Hide Subject"
+#~ msgstr "Piilota aihe"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Sulje nykyinen tiedosto"
+#~ msgid "Hide Messages"
+#~ msgstr "Piilota viestit"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Salaa tДmД viesti PGP:llД"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Piilota aihe \"%s\""
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Authentication"
+#~ msgstr "Todentaminen"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "LiitД tiedosto viestiin tekstinД"
+#~ msgid "Authentication Type:"
+#~ msgstr "Todentamistyyppi:"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "LiitД tekstitiedosto..."
+#~ msgid "E-Mail Address:"
+#~ msgstr "SДhkЖpostiosoite:"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Avaa tiedosto"
+#~ msgid "Email Address:"
+#~ msgstr "SДhkЖpostiosoite:"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "PGP-salaus"
+#~ msgid "Full Name:"
+#~ msgstr "Koko nimi:"
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "PGP-allekirjoitus"
+#~ msgid "Hostname:"
+#~ msgstr "IsДnnДn nimi:"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Tallenna nimellД..."
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Tallenna _kansioon..."
+#~ msgid "Organization:"
+#~ msgstr "Organisaatio:"
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "Tallenna kansioon..."
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
 
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "Tallenna tiedosto uudella nimellД"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Tallenna viesti johonkin tiettyyn kansioon"
+#~ msgid "Save password"
+#~ msgstr "Tallenna salasana"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "LДhetД"
+#~ msgid "Select signature file"
+#~ msgstr "Valitse allekirjoitustiedosto"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "LДhetД _myЖhemmin"
+#~ msgid "Server Configuration"
+#~ msgstr "Palvelimen asetukset"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "LДhetД _myЖhemmin"
+#~ msgid "Server Type: "
+#~ msgstr "Palvelintyyppi: "
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "LДhetД viesti HTML-muodossa"
+#~ msgid "Server requires authentication"
+#~ msgstr "Palvelin vaati todennuksen"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "LДhetД viesti myЖhemmin"
+#~ msgid "Servers"
+#~ msgstr "Palvelimet"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "LДhetД viesti heti"
+#~ msgid "Signature file:"
+#~ msgstr "Allekirjoitustiedosto:"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "LДhetД viesti heti"
+#~ msgid "Sources"
+#~ msgstr "LДhteet"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "NДytД / piilota liitetiedostot"
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "TДmД palvelin vaatii turvatun yhteyden (SSL)"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "NДytД _liitteet"
+#~ msgid "Type"
+#~ msgstr "Tyyppi"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "NДytД liitteet"
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Anna nimi jolla haluat viitata nДihin palvelimiin. Esimerkiksi \"TyЖ\" tai "
+#~ "\"Koti\"."
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr "Allekirjoita viesti PGP-avaimellasi"
+#~ msgid "User Information"
+#~ msgstr "KДyttДjДtiedot"
 
-#: po/tmp/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "_LiitД tekstitiedosto..."
+#~ msgid "Username:"
+#~ msgstr "KДyttДjДnimi:"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Avaa..."
+#~ msgid "minute(s)"
+#~ msgstr "minuutti(a)"
 
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr "_Turvallisuus"
+#~ 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 ""
+#~ "Anna nimi ja sДhkЖpostiosoite, joita kДytetДДn lДhtevДssД postissa. Voit "
+#~ "myЖs halutessasi antaa organisaatiosi nimen, sekД tiedostonimen, josta "
+#~ "allekirjoituksesi luetaan."
 
-#.
-#. * 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 ""
+#~ msgid "Full name:"
+#~ msgstr "Koko nimi:"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#~ msgid "Email address:"
+#~ msgstr "SДhkЖpostiosoite:"
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#~ msgid "Signature File"
+#~ msgstr "Allekirjoitustiedosto"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#~ msgid "Server:"
+#~ msgstr "Palvelin:"
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Tilaa"
+#~ msgid "Detect supported types..."
+#~ msgstr "Etsi tuettuja tyyppejД..."
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Poista tilaus"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "дlД poista viestejД palvelimelta"
 
-#.
-#. * 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 ""
+#~ msgid "Test Settings"
+#~ msgstr "Kokeile asetuksia"
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "_Poistu"
+#~ msgid "Add Source"
+#~ msgstr "LisДД lДhde"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr ""
+#~ msgid "Edit Source"
+#~ msgstr "Muokkaa lДhdettД"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Poistu ohjelmasta"
+#~ msgid "Add News Server"
+#~ msgstr "LisДД uutispalvelin"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr ""
+#~ msgid "Edit News Server"
+#~ msgstr "Muokkaa uutispalvelinta"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
+#~ msgid "Testing \"%s\""
+#~ msgstr "Kokeillaan: \"%s\""
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr ""
+#~ msgid "The connection was successful!"
+#~ msgstr "YhdistДminen onnistui!"
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr ""
+#~ msgid "Address"
+#~ msgstr "Osoite"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Merkitse viesti nДhdyksi [ms]: "
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
+#~ msgid "News Servers"
+#~ msgstr "Uutispalvelimet"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
+#~ msgid "Send messages in HTML format"
+#~ msgstr "LДhetД viestit HTML-muodossa"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "TДssД Evolutionin versiossa ei ole GPG/PGP-tukea."
 
-#: po/tmp/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#~ msgid "Delete a contact"
+#~ msgstr "Poista kontakti"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr ""
+#~ msgid "Find"
+#~ msgstr "Etsi"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#~ msgid "Find a contact"
+#~ msgstr "Etsi kontakti"
 
-#: po/tmp/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr ""
+#~ msgid "Print contacts"
+#~ msgstr "Tulosta kontaktit"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Tapaaminen"
+#~ msgid "Stop"
+#~ msgstr "PysДytД"
 
-#: po/tmp/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Kontakti"
+#~ msgid "Stop Loading"
+#~ msgstr "PysДytД lataaminen"
 
-#: po/tmp/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Kansio"
+#~ msgid "View All"
+#~ msgstr "NДytД kaikki"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Siirry kansioon..."
+#~ msgid "View all contacts"
+#~ msgstr "NДytД kaikki kontaktit"
 
-#: po/tmp/evolution.xml.h:29
-msgid "_Index"
-msgstr ""
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Tulosta kontaktit..."
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#~ msgid "_Search for contacts"
+#~ msgstr "_Etsi kontakteja"
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_Asetukset"
+#~ msgid "5 Days"
+#~ msgstr "5 pДivДД"
 
-#: po/tmp/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#~ msgid "Alter preferences"
+#~ msgstr "Muuta asetuksia"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#~ msgid "Ca_lendar"
+#~ msgstr "_Kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Kalenterin asetukset..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
+#~ msgid "Create a new appointment"
+#~ msgstr "Luo uusi tapaaminen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
+#~ msgid "Create a new calendar"
+#~ msgstr "Luo uusi kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
+#~ msgid "Month"
+#~ msgstr "Kuukausi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#~ msgid "Open a calendar"
+#~ msgstr "Avaa kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Asetukset"
+#~ msgid "Print this calendar"
+#~ msgstr "Tulosta tДmД kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#~ msgid "Show 1 day"
+#~ msgstr "NДytД 1 pДivД"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#~ msgid "Show 1 month"
+#~ msgstr "NДytД 1 kuukausi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#~ msgid "Show 1 week"
+#~ msgstr "NДytД 1 viikko"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Show the working week"
+#~ msgstr "NДytД tyЖviikko"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#~ msgid "Week"
+#~ msgstr "Viikko"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "_New"
+#~ msgstr "_Uusi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#~ msgid "_Open Calendar"
+#~ msgstr "_Avaa kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#~ msgid "_Print this calendar"
+#~ msgstr "_Tulosta tДmД kalenteri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#~ msgid "_Save As..."
+#~ msgstr "Tallenna _nimellД..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#~ msgid "Delete..."
+#~ msgstr "Poista..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr ""
+#~ msgid "Help"
+#~ msgstr "Apua"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
+#~ msgid "Print..."
+#~ msgstr "Tulosta..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#~ msgid "Save _As..."
+#~ msgstr "Tallenna _nimellД..."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#~ msgid "Save and Close"
+#~ msgstr "Tallenna ja sulje"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "_File"
+#~ msgstr "_Tiedosto"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nyt"
+#~ msgid "_Print..."
+#~ msgstr "T_ulosta..."
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#~ msgid "_Save"
+#~ msgstr "_Tallenna"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#~ msgid "About..."
+#~ msgstr "Tietoja..."
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "RyhmД %i"
+#~ msgid "C_ut"
+#~ msgstr "L_eikkaa"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Sulje tДmД tapaaminen"
+
+#~ msgid "Copy"
+#~ msgstr "Kopioi"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopioi valinta"
+
+#~ msgid "Cut"
+#~ msgstr "Leikkaa"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Leikkaa valinta"
+
+#~ msgid "Find Again"
+#~ msgstr "Etsi uudelleen"
+
+#~ msgid "Find _Again"
+#~ msgstr "Etsi uude_lleen"
+
+#~ msgid "Paste"
+#~ msgstr "LiitД"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "LiitД leikepЖytД"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Tulost_usasetukset"
+
+#~ msgid "Print Setup"
+#~ msgstr "Tulostusasetukset"
+
+#~ msgid "Redo"
+#~ msgstr "Tee uudelleen"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Tee kumottu toiminto uudelleen"
+
+#~ msgid "Replace"
+#~ msgstr "Korvaa"
+
+#~ msgid "Replace a string"
+#~ msgstr "Korvaa merkkijono"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#~ msgid "Save the current file"
+#~ msgstr "Tallenna nykyinen tiedosto"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Etsi uudelleen samaa merkkijonoa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Etsi merkkijonoa"
+
+#~ msgid "Select All"
+#~ msgstr "Valitse kaikki"
+
+#~ msgid "Select everything"
+#~ msgstr "Merkitsee kaikki valituksi"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
+#~ msgid "Undo"
+#~ msgstr "Kumoa"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Kumoa edellinen toiminto"
+
+#~ msgid "_About..."
+#~ msgstr "_Tietoja..."
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopioi"
+
+#~ msgid "_Edit"
+#~ msgstr "_Muokkaa"
+
+#~ msgid "_Find..."
+#~ msgstr "_Etsi..."
+
+#~ msgid "_Help"
+#~ msgstr "_Apua"
+
+#~ msgid "_Paste"
+#~ msgstr "L_iitД"
+
+#~ msgid "_Print"
+#~ msgstr "_Tulosta"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Korvaa..."
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Piilota _poistetut viestit"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Piilota _luetut viestit"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Piilota _valitut viestit"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merkitse _lukemattomaksi"
+
+#~ msgid "Move"
+#~ msgstr "SiirrД"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Esikatsele tulostettavaa viestiД"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Viestin tulostuksen esikatselu..."
+
+#~ msgid "Print message..."
+#~ msgstr "Tulosta viesti..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Vastaa _Kaikille"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Vastaa _LДhettДjДlle"
+
+#~ msgid "Select _All"
+#~ msgstr "Valitse _kaikki"
+
+#~ msgid "Show _All messages"
+#~ msgstr "NДytД _kaikki viestit"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopioi kansioon..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Muokkaa viestiД"
+
+#~ msgid "_Message"
+#~ msgstr "_Viesti"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_SiirrД kansioon..."
+
+#~ msgid "_Print Message"
+#~ msgstr "_Tulosta viesti"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Tallenna _viesti nimellД..."
+
+#~ msgid "_Undelete"
+#~ msgstr "_Palauta"
+
+#~ msgid "Attach"
+#~ msgstr "LiitД"
+
+#~ msgid "Close the current file"
+#~ msgstr "Sulje nykyinen tiedosto"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Salaa tДmД viesti PGP:llД"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "LiitД tiedosto viestiin tekstinД"
+
+#~ msgid "Insert text file..."
+#~ msgstr "LiitД tekstitiedosto..."
+
+#~ msgid "Open a file"
+#~ msgstr "Avaa tiedosto"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP-salaus"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP-allekirjoitus"
+
+#~ msgid "Save As"
+#~ msgstr "Tallenna nimellД..."
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Tallenna _kansioon..."
+
+#~ msgid "Save in folder..."
+#~ msgstr "Tallenna kansioon..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Tallenna tiedosto uudella nimellД"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Tallenna viesti johonkin tiettyyn kansioon"
+
+#~ msgid "Send"
+#~ msgstr "LДhetД"
+
+#~ msgid "Send _Later"
+#~ msgstr "LДhetД _myЖhemmin"
+
+#~ msgid "Send _later"
+#~ msgstr "LДhetД _myЖhemmin"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "LДhetД viesti HTML-muodossa"
+
+#~ msgid "Send the message later"
+#~ msgstr "LДhetД viesti myЖhemmin"
+
+#~ msgid "Send the message now"
+#~ msgstr "LДhetД viesti heti"
+
+#~ msgid "Send this message now"
+#~ msgstr "LДhetД viesti heti"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "NДytД / piilota liitetiedostot"
+
+#~ msgid "Show _attachments"
+#~ msgstr "NДytД _liitteet"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Allekirjoita viesti PGP-avaimellasi"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_LiitД tekstitiedosto..."
+
+#~ msgid "_Open..."
+#~ msgstr "_Avaa..."
+
+#~ msgid "_Security"
+#~ msgstr "_Turvallisuus"
+
+#~ msgid "Subscribe"
+#~ msgstr "Tilaa"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Poista tilaus"
+
+#~ msgid "E_xit"
+#~ msgstr "_Poistu"
+
+#~ msgid "Exit the program"
+#~ msgstr "Poistu ohjelmasta"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Tapaaminen"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakti"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Siirry kansioon..."
+
+#~ msgid "_Settings"
+#~ msgstr "_Asetukset"
diff --git a/po/fr.po b/po/fr.po
index ffdfb8eebf..9d73766abb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-10 15:05+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-10 15:05+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -17,6 +17,182 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Ne peut initialiser Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Aucun message correspondant"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "RИcupИration du courrier depuis %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Fermer"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "DИplacer vers le dossier"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Va Ю la date actuelle"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Va Ю la date actuelle"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configuration du dossier..."
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Ne peut ouvrir le fichier %s :\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Erreur de lecture du fichier de courrier : %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Pas d'erreur"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Test de connexion Ю \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Ne peut se connecter au serveur POP sur %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nouveau"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "CrИe une nouveau contact"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Ne peut initialiser Bonobo"
+
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Carte : "
@@ -303,17 +479,6 @@ msgstr ""
 "\n"
 "ClИ publique : "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Ne peut initialiser Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -433,40 +598,32 @@ msgstr ""
 "Une erreur est survenue durant la rИcupИration de\n"
 "la liste des Pilot depuis le dИmon gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Le curseur ne peut etre chargИ\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook non chargИ\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Ne peut dИmarrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Ne peut dИmarrer wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 
 #.
-#. * 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 "Supprimer le contact ?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -476,7 +633,7 @@ msgid "_Add"
 msgstr "_Ajouter"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -489,13 +646,7 @@ msgstr "Types de tИlИphones"
 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
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Ajouter"
 
@@ -553,7 +704,6 @@ msgid "C_ontacts..."
 msgstr "C_ontacts..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tИgories..."
 
@@ -570,7 +720,6 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "GИnИral"
 
@@ -615,24 +764,27 @@ msgid "No_tes:"
 msgstr "No_tes :"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "DИtails"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistant"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Travail"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Travail 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Fax travail"
 
@@ -641,6 +793,7 @@ msgid "Callback"
 msgstr "RИpondeur"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Voiture"
 
@@ -650,27 +803,33 @@ msgstr "SociИtИ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Maison"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Maison 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax maison"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "RNIS"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobile"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Autre"
 
@@ -679,10 +838,12 @@ msgid "Other Fax"
 msgstr "Fax autre"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Principal"
 
@@ -699,62 +860,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #.
-#. * 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 "Verifier l'adresse"
-
-#: 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 :"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Ville :"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "BoНte _postale :"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "иtat/_Province :"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Code postal :"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -821,12 +936,7 @@ msgstr "_Suffixe :"
 msgid "As _Minicards"
 msgstr "Comme _minicartes"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Comme _tableau"
 
@@ -859,27 +969,27 @@ msgstr ""
 "vous devriez tИlИcharger et installer OpenLDAP, puis\n"
 "recompiler et installer Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Afficher tout"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "AvancИe..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "L'e-mail contient"
 
-#: addressbook/gui/component/addressbook.c:705
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -904,7 +1014,7 @@ msgid "None (anonymous mode)"
 msgstr "Aucun (mode anonyme)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
@@ -943,7 +1053,6 @@ msgid "Remember this password"
 msgstr "Se souvenir de ce mot de passe"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
 msgid "Host:"
 msgstr "HТte :"
 
@@ -960,12 +1069,10 @@ msgid "Search Scope:"
 msgstr "Domaine de recherche :"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Identification :"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Chemin :"
 
@@ -990,184 +1097,85 @@ msgstr ""
 "informations le concernant."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Nom :"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Description :"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
-
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:685 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: 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:24
-msgid "Delete"
-msgstr "Supprimer"
-
-#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
-msgid "Edit"
-msgstr "иditer"
-
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Nom"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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 "Rechercher..."
-
-#: 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:"
-msgstr "SИlectionnez un nom depuis :"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Rechercher"
 
-#.
-#. * 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"
-
-#: 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"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Enregistrer comme VCard"
 
-#: po/tmp/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Nom"
 
-#: po/tmp/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-mail 2"
 
-#: po/tmp/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisation"
 
-#: po/tmp/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: po/tmp/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_DИpartement :"
 
-#: po/tmp/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Bureau :"
 
-#: po/tmp/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Titre :"
 
-#: po/tmp/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Profession :"
 
-#: po/tmp/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Pager"
 
-#: po/tmp/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Sur_nom :"
 
-#: po/tmp/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_Conjoint(e) :"
 
-#: po/tmp/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Aucune"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Enregistrer comme VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
@@ -1185,178 +1193,6 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour crИer un nouveau contact."
 
-#.
-#. * 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 "Formulaires blancs Ю la fin :"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Corps"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Bas :"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensions :"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Police..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Polices"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Pied de page :"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Format"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "En-tЙte"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "En-tЙte/Pied de page"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "En-tЙtes"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "En-tЙtes pour chaque lettre"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Hauteur :"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Se suivre immИdiatement l'un l'autre"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Inclure :"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Paysage"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Gauche :"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "SИlecteurs de lettre sur le cotИ"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marges"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Nombre de colonnes :"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Options"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Orientation"
-
-#: 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"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Source de papier :"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Portrait"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "AperГu :"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Imprimer en utilisant un ombrage gris"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Retourner sur les pages paires"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Droite :"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sections :"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Ombrage"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Taille :"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "DИmarrer sur une nouvelle page"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Nom du style :"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Haut :"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:73
-msgid "Type:"
-msgstr "Type :"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Largeur :"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conduit 'Calendrier' d'Evolution"
@@ -1366,13 +1202,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 
@@ -1384,8 +1220,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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application 'ю faire' du Pilot"
 
@@ -1394,7 +1230,7 @@ msgstr "Ne peut lire le bloc d'application 'ю faire' du Pilot"
 msgid "Reminder of your appointment at "
 msgstr "Rappel de votre rendez-vous Ю "
 
-#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Sieste"
 
@@ -1404,19 +1240,19 @@ msgstr "Sieste"
 msgid "Ok"
 msgstr "Valider"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Ouvrir le calendrier"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Enregistrer le calendrier"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1424,7 +1260,7 @@ msgstr ""
 "d'ORBit et d'OAF."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1432,57 +1268,57 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:326 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:329 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "PrivИ"
 
-#: calendar/gui/calendar-model.c:332 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1494,7 +1330,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1502,27 +1338,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:845
+#: calendar/gui/calendar-model.c:893
 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:848
+#: calendar/gui/calendar-model.c:896
 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:852
+#: calendar/gui/calendar-model.c:900
 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:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1532,562 +1368,284 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 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:1055
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritИ doit Йtre comprise entre 1 et 9 inclus"
 
-#: calendar/gui/calendar-summary.c:93
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:298
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Erreur de chargement du calendrier</b>"
 
-#: calendar/gui/calendar-summary.c:303
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-"<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
-
-#: calendar/gui/calendar-summary.c:309
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Erreur de chargement du calendrier :<br>MИthode non supportИe"
 
-#: calendar/gui/calendar-summary.c:475
+#: calendar/gui/calendar-summary.c:484
 msgid "Display"
 msgstr "Affichage"
 
-#: calendar/gui/calendar-summary.c:480
+#: calendar/gui/calendar-summary.c:489
 msgid "Show appointments"
 msgstr "Afficher les rendez-vous"
 
-#: calendar/gui/calendar-summary.c:488
+#: calendar/gui/calendar-summary.c:497
 msgid "Show tasks"
 msgstr "Afficher les tБches"
 
-#: calendar/gui/calendar-summary.c:580
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "Chargement du calendrier"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarme le %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Aucun rИsumИ disponible."
 
-#.
-#. * 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 "Fermer"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "иditer le rendez-vous"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "DurИe de la sieste (minutes)"
-
-#.
-#. * 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 minutes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 heures (am/pm)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minutes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 heures"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minutes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minutes"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Expiration des alarmes aprХs"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Alarmes auditives"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Biper quand les fenЙtres d'alarme apparaissent."
-
-#: po/tmp/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "PrИfИrences du calendrier"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Couleurs"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Compresser les week-ends"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Options du navigateur de date"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "DИfauts"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Options d'affichage"
-
-#: po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Date d'ИchИance"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Activer la sonnerie pour"
-
-#: 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:438 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "Vendredi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Mettre en Иvidence"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "иlИments s'achevant aujourd'hui"
-
-#: 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 pas encore expirИs"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "иlИments pas encore expirИs :"
-
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/event-editor.c:434 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 en retard :"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
-
-#: po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "PrioritИ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr "Alarmes"
-
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "Sam"
-
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "Samedi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Afficher"
-
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Afficher l'heure de fin des rendez-vous"
-
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Afficher les numИros de semaine"
-
-#: po/tmp/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "DИbut de la journИe :"
-
-#. 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/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: po/tmp/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "TБchePad"
-
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "Jeu"
-
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "DurИe avant ИchИance"
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Divisions du temps :"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Format de date :"
-
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Alarmes visuelles"
-
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Semaine de travail"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minutes avant leur dИbut."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "secondes."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer le rendez-vous `%s' ?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "йtes-vous sШr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer la tБche `%s' ?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "йtes-vous sШr de vouloir supprimer cette tБche sans titre %s ?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer l'entrИe de journal `%s' ?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "йtes-vous sШr de vouloir supprimer cet entrИe de journal sans titre ?"
 
-#.
-#. * 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"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "ComplИtИe"
-
-#: 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"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "En cours"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Basse"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Aucune"
-
-#: 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"
-
-#: 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"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL :"
-
-#: 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:690
 msgid "Edit Task"
 msgstr "иditer la tБche"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Aucun rИsumИ"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "TБche - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "EntrИe de journal - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Voulez-vous enregistrer les changements ?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "catИgories"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Classification"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "ComplИtИe"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Fin aprИs"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Date de _dИbut : "
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Date d'ИchИance"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Marque la tБche comme complИtИe"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "PrioritИ"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "RИs_umИ"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Transparent"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL :"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Ouvrir la tБche"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Marquer comme terminИe"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Marque la tБche comme complИtИe"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Supprimer"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Supprimer la tБche"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "иditer ce rendez-vous..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Rendre ce rendez-vous dИplaГable"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"CatИgories : "
+
+#: calendar/gui/e-tasks.c:285
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger le calendrier dans `%s'"
 
-#: calendar/gui/e-tasks.c:292
-#, fuzzy, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "Ne peut crИer un calendrier dans `%s'"
-
-#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#: calendar/gui/e-tasks.c:297
 #, 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"
@@ -2095,290 +1653,111 @@ msgstr "La mИthode requise pour charger `%s' n'est pas supportИe"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "_Toute la journИe"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Rendez-vous ИlИmentaires"
-
-#: po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr "Classification"
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr "RИcurrence personnalisИe"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Jours"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Tou(te)s les"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Heures"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Cou_rrier Ю :"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minutes"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "Modifier"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr "Aucune rИcurrence"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr "AperГu"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Pri_vИ"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr "RИcurrence"
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr "RХgle de rИcurrence"
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr "Alarme"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "RИcurrence simple"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "RИsu_mИ :"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Horaire"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "_Audio"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "_Confidentiel"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Contacts"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "_Affichage"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Heure de _fin :"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "_Courrier"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "_Programme"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "_Lancer le programme :"
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "Heure de _dИbut :"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "Date de _dИbut :"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
-msgstr "jour(s)"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "pour"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "иditer le rendez-vous"
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "toujours"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "le"
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "jour"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr "mois"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Lundi"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr "jusqu'Ю"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Mardi"
 
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr "semaine(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Mercredi"
 
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr "annИe(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Jeudi"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "иditer le rendez-vous"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Vendredi"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "le"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Samedi"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "jour"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Dimanche"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "dans le"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "iХme"
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "occurences"
 
-#: calendar/gui/event-editor.c:838
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vons contient des rИcurrences qu'Evolution ne peut Иditer."
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Ne peut charger le calendrier dans `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Ne peut crИer un calendrier dans `%s'"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "avril"
-
-#: po/tmp/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "aout"
-
-#: po/tmp/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "dИcembre"
-
-#: po/tmp/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "fИvrier"
-
-#: po/tmp/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Aller Ю la date"
-
-#: po/tmp/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Aller Ю aujourd'hui"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Ne peut ouvrir le dossier `%s' :\n"
+"%s"
 
-#: po/tmp/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "janvier"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "La mИthode requise pour charger `%s' n'est pas supportИe"
 
-#: po/tmp/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "juillet"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dim"
 
-#: po/tmp/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "juin"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
 
-#: po/tmp/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "mars"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
 
-#: po/tmp/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Lundi"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mer"
 
-#: po/tmp/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "novembre"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Jeu"
 
-#: po/tmp/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "octobre"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
 
-#: po/tmp/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "septembre"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sam"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -2572,11 +1951,11 @@ msgstr "AnnИe en cours (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "AperГu Avant Impression"
 
-#: calendar/gui/tasks-control.c:103
+#: calendar/gui/tasks-control.c:105
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
@@ -2673,29 +2052,37 @@ 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:183
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:187
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:235
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "AnnulИe"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, 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:236
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(hТte inconnu)"
 
-#: camel/camel-remote-store.c:460
-msgid "Server disconnected."
-msgstr "Serveur dИconnectИ."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Ouvrir le calendrier"
 
 #: camel/camel-service.c:137
 #, c-format
@@ -2722,12 +2109,12 @@ msgstr "Aucun hТte %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporairement impossible de rИsoudre le nom d'hТte %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2764,40 +2151,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Mauvaise rИponse d'identification du serveur."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RИponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "иchec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "La rИponse du serveur s'est terminИe trop tot."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "RИponse OK innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, 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:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la rИponse FETCH."
 
@@ -2809,29 +2197,29 @@ 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:250
+#: camel/providers/imap/camel-imap-store.c:251
 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:259
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:261
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant Kerberos 4 pour "
 "vous identifier."
 
-#: camel/providers/imap/camel-imap-store.c:335
+#: camel/providers/imap/camel-imap-store.c:361
 #, 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:363
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2842,13 +2230,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:619
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut crИer le rИpertoire %s : %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+#, fuzzy
+msgid "MH-format mail directories"
 msgstr "RИpertoires de courrier au format UNIX MH (version CamelLocal)"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2857,15 +2246,16 @@ msgstr ""
 "Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 msgid "For storing local mail in standard mbox format"
 msgstr "Pour stocker le courrier local au format standard mbox"
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
 msgstr "Fichiers de courrier au format UNIX qmail maildir"
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3322,7 +2712,6 @@ msgid "No such folder `%s'."
 msgstr "Aucun dossier `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:62
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3398,7 +2787,6 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:295
-#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3459,47 +2847,47 @@ msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Ne peut crИer de tube vers sendmail : %s : courrier non envoyИ"
 
 #: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:621
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
-#: camel/providers/smtp/camel-smtp-transport.c:654
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "sendmail s'est terminИ avec le signal %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:694
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3543,12 +2931,11 @@ msgid "attachment"
 msgstr "piХce-jointe"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Enlever"
 
@@ -3564,56 +2951,40 @@ msgstr "Ajouter une piХce-jointe..."
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#.
-#. * 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 "PropriИtИs de la piХce-jointe"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nom du fichier : "
-
-#: 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:305
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "De : "
 
-#: composer/e-msg-composer-hdrs.c:249
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:313
 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:310 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "ю : "
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc : "
 
-#: composer/e-msg-composer-hdrs.c:316
+#: composer/e-msg-composer-hdrs.c:323
 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:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc : "
 
-#: composer/e-msg-composer-hdrs.c:322
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3621,11 +2992,11 @@ 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:328 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Sujet : "
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Entrez le sujet du message"
 
@@ -3638,38 +3009,38 @@ msgstr ""
 "Ne peut ouvrir le fichier de signature %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Enregistrement des changements dans le message..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Enregistrer les changements dans le message..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, 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:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3679,27 +3050,27 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Ce fichier n'existe pas."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Ce n'est pas un fichier normal."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Ce fichier existe mais n'est pas lisible."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3707,27 +3078,23 @@ 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:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Ne peut crИer la fenЙtre de composition."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Recher_cher"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "an"
@@ -3859,7 +3226,7 @@ msgstr "entrant"
 msgid "outgoing"
 msgstr "sortant"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "иditer les Filtres"
 
@@ -3958,30 +3325,6 @@ msgstr "Important"
 msgid "Read"
 msgstr "Lu"
 
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "иditer les dossiers virtuels"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "RХgles de Filtrage"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "Entrant"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "Sortant"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Dossiers Virtuels"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Sources de Dossier Virtuel"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -4040,6 +3383,7 @@ msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
 msgid "Score"
 msgstr "Score"
 
@@ -4059,7 +3403,7 @@ msgstr "Source"
 msgid "Specific header"
 msgstr "En-tЙte spИcifique"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
 msgid "Status"
 msgstr "иtat"
 
@@ -4067,7 +3411,7 @@ msgstr "иtat"
 msgid "Stop Processing"
 msgstr "ArrЙte le traitement"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
 msgid "Subject"
 msgstr "Sujet"
 
@@ -4167,216 +3511,162 @@ msgstr "Ajouter une rХgle de dossier virtuel"
 msgid "Edit VFolder Rule"
 msgstr "иditez la rХgle du dossier virtuel"
 
-#: mail/component-factory.c:280
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Enregistrer"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "SИlectionnez un Dossier"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Le corps ou le sujet contient"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Le corps contient"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Le sujet contient"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Le corps ne contient pas"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "Dossier virtuel sur l'expИditeur"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "Dossier virtuel sur les destinataires"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtre sur l'expИditeur"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Afficher tous les cachИs"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Cacher sИlectionnИ"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Cacher lu"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Cacher supprimИ"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Cacher Sujet"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "Cacher de l'expИditeur"
-
-#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Ouvrir"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "иditer"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Imprimer"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "RИpondre Ю l'expИditeur"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "RИpondre Ю tous"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Faire suire incorporИ"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "DИplacer vers le dossier..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "RИcupИrer"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "Cacher les messages"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Cacher le sujet \"%s\""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "Cacher depuis l'expИditeur <%s>"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Ne peut dИmarrer wombat"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr ""
-
-#: po/tmp/local-config.glade.h:8
-#, fuzzy
-msgid "New store format:"
-msgstr "Type de sources de nouvelles :"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr ""
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr ""
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr ""
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Aucune"
 
-#: po/tmp/local-config.glade.h:14
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid " (default)"
+msgstr "DИfaut"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:343
+#: mail/mail-accounts.c:347
 #, fuzzy
 msgid "Evolution Account Manager"
 msgstr "Gestionnaire de comptes"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:588
+#: mail/mail-account-editor.c:634
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conduit 'ю faire' d'Evolution"
@@ -4401,7 +3691,7 @@ msgstr "Courrier de %s"
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-callbacks.c:78
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4413,7 +3703,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:121
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4421,7 +3711,7 @@ msgstr ""
 "Vous devez configurer une identitИ\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:133
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4429,19 +3719,15 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
-msgid "You have no mail sources configured"
-msgstr "Vous n'avez pas de source de courrier configurИ"
-
-#: mail/mail-callbacks.c:218
+#: mail/mail-callbacks.c:223
 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:227
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Vous n'avez pas de boНte de sortie configurИ"
 
-#: mail/mail-callbacks.c:249
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4449,24 +3735,31 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Vous devez configurer une identitИ\n"
+"avant de pouvoir composer un message."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Vous devez spИcifier des destinataires afin de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:537
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "DИplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4474,11 +3767,11 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "иcraser le fichier ?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4486,15 +3779,15 @@ msgstr ""
 "Un fichier avec le mЙme nom existe.\n"
 "L'Иcraser ?"
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:923
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4503,240 +3796,30 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:972
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "иchec de l'impression du message"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
-msgid "Account"
-msgstr "Compte"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Information du compte"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "Gestionnaire de comptes"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "PropriИtИs du compte"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "AvancИe"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "Identification"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Type d'identification :"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "FИlicitations, votre configuration de messagerie est effectuИ.\n"
-
-#: po/tmp/mail-config.glade.h:22
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:23
-msgid "Default"
-msgstr "DИfaut"
-
-#: po/tmp/mail-config.glade.h:25
-msgid "Done"
-msgstr "Fait"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "E-Mail Address:"
-msgstr "Adresse Иlectronique :"
-
-#: po/tmp/mail-config.glade.h:28
-msgid "Email Address:"
-msgstr "Adresse Иlectronique :"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "Configuration de la messagerie Evolution"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Full Name:"
-msgstr "Nom complet :"
-
-#: po/tmp/mail-config.glade.h:33
-msgid "Hostname:"
-msgstr "Nom d'hТte :"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Identity"
-msgstr "IdentitИ"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Keep mail on server"
-msgstr ""
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Mail"
-msgstr "Courrier"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail Account"
-msgstr "Compte de messagerie"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Configuration"
-msgstr "Configuration de la messagerie"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration Druid"
-msgstr "Assistant de configuration de messagerie"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Make this my default account"
-msgstr ""
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: po/tmp/mail-config.glade.h:45
-msgid "News"
-msgstr "Nouvelles"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "Optional"
-msgstr "Optionnel"
-
-#: po/tmp/mail-config.glade.h:48
-msgid "Organization:"
-msgstr "Organisation :"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Serveur de courrier sortant"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Plain Text"
-msgstr "Texte plein"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Receiving Email"
-msgstr "RИception des messages"
-
-#: po/tmp/mail-config.glade.h:54
-msgid "Remember my password"
-msgstr "Se souvenir de mon mot de passe"
-
-#: mail/mail-format.c:628 po/tmp/mail-config.glade.h:55
-msgid "Reply-To:"
-msgstr "RИpondre-Ю :"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Reply-to:"
-msgstr "RИpondre-Ю :"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "Required"
-msgstr "Requis"
-
-#: po/tmp/mail-config.glade.h:58
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Save password"
-msgstr "Enregistrer le mot de passe"
-
-#: po/tmp/mail-config.glade.h:60
-msgid "Select signature file"
-msgstr "SИlectionner un fichier de signature"
-
-#: po/tmp/mail-config.glade.h:61
-msgid "Sending Email"
-msgstr "Envoie du message"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Server Configuration"
-msgstr "Configuration du serveur"
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Server Type: "
-msgstr "Type de serveur : "
-
-#: po/tmp/mail-config.glade.h:65
-msgid "Server requires authentication"
-msgstr "Le serveur nИcessite une identification"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Servers"
-msgstr "Serveurs"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Signature file:"
-msgstr "Fichier de signature :"
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Signature:"
-msgstr "Signature :"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "Sources"
-msgstr "Sources"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "Ce serveur nИcessite une connexion sИcurisИ (SSL)"
-
-#: po/tmp/mail-config.glade.h:71
-msgid "Type"
-msgstr "Type"
-
-#: po/tmp/mail-config.glade.h:72
+#: mail/mail-config-druid.c:363
+#, c-format
 msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
-"\"Travail\" ou \"Maison\"."
 
-#: po/tmp/mail-config.glade.h:74
-msgid "User Information"
-msgstr "Information utilisateur"
-
-#: po/tmp/mail-config.glade.h:75
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: po/tmp/mail-config.glade.h:76
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#: mail/mail-config-druid.c:629
+#, c-format
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:821
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr ""
 
@@ -4789,50 +3872,54 @@ msgstr "Voir en ligne (via %s)"
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "piХce-jointe %s"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "RИpondre-Ю :"
+
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "иditer le message"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1440
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1452
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1454
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:1490
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1495
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1665
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Le %s, %s a Иcrit :\n"
@@ -4892,7 +3979,7 @@ msgstr "Enregistrement du dossier local"
 msgid "Register local folder"
 msgstr "Enregistre le dossier local"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -4923,143 +4010,143 @@ msgstr ""
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "RИcupИration du courrier depuis %s"
 
-#: mail/mail-ops.c:91
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "RИcupХre le courrier depuis %s"
 
-#: mail/mail-ops.c:336
+#: mail/mail-ops.c:359
 #, 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:406
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrage d'e-mail Ю la demande"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtre d'e-mail Ю la demande"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "ExpИdition de \"%s\""
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Envoie du message"
 
-#: mail/mail-ops.c:670
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "ExpИdition de la queue"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "ExpИdie la queue"
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:812
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Adjation de \"%s\""
 
-#: mail/mail-ops.c:809 mail/mail-ops.c:815
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Adjoint un message sans sujet"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "DИplacement des messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Duplication des messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "DИplace les messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copie les messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:936
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "DИplacement"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:959
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s message %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans \"%s\""
 
-#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Aucune description)"
 
-#: mail/mail-ops.c:1165
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synchronisation du dossier"
 
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "RИcupИration du message %s"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "RИcupИration des messages"
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1527
 #, 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:1656
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Chargement de %s dossier pour %s"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Charge %s dossier pour %s"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5068,12 +4155,12 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Enregistrement du message %d sur %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5196,145 +4283,190 @@ msgstr "Nouveau dossier virtuel"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "RИpondre"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "RИpond Ю l'expИditeur du message"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "RИpond Ю l'expИditeur et Ю tous les destinataires du message"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Fait suivre le message"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Imprime le message sИlectionnИ"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Supprime le message"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "RИpondu"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:890
 #, 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:896 mail/message-list.c:912
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et tous"
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/openpgp-utils.c:76
-#, c-format
-msgid "Please enter your %s passphrase%s%s"
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "piХce-jointe"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "De : "
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Date d'ИchИance"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Date de rИception"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "ю : "
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Taille :"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
 msgstr "Veuillez entrer votre %s phrase de passe%s%s"
 
-#: mail/openpgp-utils.c:77
-msgid " for "
-msgstr " pour "
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Veuillez entrer votre %s phrase de passe%s%s"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
 msgid "No GPG/PGP program available."
 msgstr "Aucun programme GPG/PGP disponible."
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
 msgid "No password provided."
 msgstr "Aucun mot de passe fournit."
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut crИer le tube vers GPG/PGP : %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
 msgid "No recipients specified"
 msgstr "Aucun destinataires spИcifiИs"
 
-#: mail/openpgp-utils.c:1061
+#: mail/openpgp-utils.c:1065
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Ne peut crИer de fichier temporaire : %s"
 
-#: mail/subscribe-dialog.c:139
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Dossiers"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Score"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Afficher les dossiers commenГant avec :"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "DИsabonnement au dossier \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "S'abonne au dossier \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Se dИsabonne du dossier \"%s\""
@@ -5446,23 +4578,24 @@ msgstr ""
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n'a pas ИtИ trouvИ dans votre $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut Йtre exИcutИ."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5472,7 +4605,7 @@ 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:334
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
@@ -5480,13 +4613,18 @@ msgstr "Aller au dossier..."
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affichИ)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Dossiers"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5494,7 +4632,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrepТt local -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5503,15 +4641,15 @@ msgstr ""
 "Ouups !  La vue pour `%s' est morte de maniХre inattendue.  :-(\n"
 "Cela signifie probablement que le composant %s a plantИ."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5520,51 +4658,61 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "`%s' de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Petits icones"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Affiche les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Grands icones"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Affiche les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Afficher la barre de _raccourcis"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Afficher la barre de _raccourcis"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activer"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Active ce raccourci"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprime ce raccourci de la barre de raccourcis"
 
@@ -5572,13 +4720,11 @@ msgstr "Supprime ce raccourci de la barre de raccourcis"
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Vue"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Voir le sИlecteur de dossier"
 
@@ -5693,1272 +4839,1853 @@ msgstr "DИsactiver."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "CrИe une nouveau contact"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Nouveau rendez-vous..."
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Supprimer le contact"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Rechercher"
+#: ui/evolution-contact-editor.xml:10
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "иditer le message"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Rechercher un contact"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nouveau"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Imprimer les contacts"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "ArrЙter"
+#: ui/evolution-contact-editor.xml:14
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "EntrИe de journal - %s"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "ArrЙte le chargement"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Tout voir"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "Configuration du carnet d'_adresses..."
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Imprimer les contacts..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Rechercher des contacts"
+#: ui/evolution-contact-editor.xml:35
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Enregistrer la piХce-jointe"
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Outils"
+#: ui/evolution-contact-editor.xml:38
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "_Aller au dossier"
 
-#.
-#. * 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 jours"
+#: ui/evolution-contact-editor.xml:39
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Copier vers le dossier"
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Modifier les prИfИrences"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Mise en page :"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:42
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Calendrier"
+msgid "FIXME: Print Pre_view"
+msgstr "AperГu Avant Impression"
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "PrИfИrences du calendrier..."
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "_Filtres de message..."
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "CrИe un nouveau rendez-vous"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Marquer comme non lu"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "CrИe un nouveau calendrier"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Sujet"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Jour"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Recule dans le temps"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Avance dans le temps"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Aller Ю"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Va Ю une date prИcise"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Va Ю la date actuelle"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "Faire suivre"
+
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mois"
+#: ui/evolution-contact-editor.xml:101
+#, fuzzy
+msgid "Pre_vious"
+msgstr "PrИc"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Suivant"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Ouvre un calendrier"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Barres d'_outils"
+
+#: ui/evolution-contact-editor.xml:109
+#, fuzzy
+msgid "FIXME: _File..."
+msgstr "_Filtres de message..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:116
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Police..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formulaires"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Nouveau rendez-vous..."
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Envoie un _message au contact..."
+
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Filtres de message..."
+
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "EntrИe de journal - %s"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Copier vers le dossier"
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "иditer le message"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "иditer le message"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Faire suivre"
+
+#: ui/evolution-contact-editor.xml:157
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Faire suivre"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Insertion"
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:170
+#, fuzzy
+msgid "F_ormat"
+msgstr "Format"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Outils"
+
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Actio_ns"
+
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
 msgstr "PrИc"
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Imprime ce calendrier"
+#: ui/evolution-contact-editor.xml:247
+#, fuzzy
+msgid "Go to the previous item"
+msgstr "Va Ю la date actuelle"
+
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "_Filtres de message..."
+
+#: ui/evolution-contact-editor.xml:250
+#, fuzzy
+msgid "Go to the next item"
+msgstr "Va Ю la date actuelle"
+
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A %d %B %Y"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Essai"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "OccupИ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Hors du bureau"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Pas d'information"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Inviter d'autres personnes..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Options"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Afficher _seulement les heures de travail"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Afficher _ZommИ arriХre"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Mettre Ю jour Libre/OccupИ"
+
+#: 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 "_Choix automatique"
+
+#: 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 "_Toutes les personnes et ressources"
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Toute les _personnes et une ressource"
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Affiche une journИe"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Personnes _nИcessaires"
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Affiche un mois"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Personnes nИcessaires et _une ressource"
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Affiche une semaine"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Heure de _dИbut de la rИunion :"
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Affiche une semaine de travail"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Heure de _fin de la rИunion :"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Tout les invitИs"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMJVSD"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Maintenant"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Semaine"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nouveau"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Ouvrir un calendrier"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Recher_cher"
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Imprimer ce calendrier"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Groupe %i"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "Enregistrer _sous..."
+#~ msgid "Delete Contact?"
+#~ msgstr "Supprimer le contact ?"
 
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Supprimer cet ИlИment"
+#~ msgid "Address _2:"
+#~ msgstr "Adresse _2 :"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Supprimer..."
+#~ msgid "Canada"
+#~ msgstr "Canada"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Aide"
+#~ msgid "Check Address"
+#~ msgstr "Verifier l'adresse"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Imprimer une en_veloppe..."
+#~ msgid "Countr_y:"
+#~ msgstr "Pa_ys :"
 
-#: 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"
+#~ msgid "Finland"
+#~ msgstr "Finlande"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Imprimer..."
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Enregistrer _sous..."
+#~ msgid "_Address:"
+#~ msgstr "_Adresse :"
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Enregistrer et Quitter"
+#~ msgid "_City:"
+#~ msgstr "_Ville :"
 
-#: 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"
+#~ msgid "_PO Box:"
+#~ msgstr "BoНte _postale :"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#~ msgid "_State/Province:"
+#~ msgstr "иtat/_Province :"
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Voir l'aide en ligne"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Code postal :"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Envoie un _message au contact..."
+#~ msgid "Addressbook Sources"
+#~ msgstr "Sources du carnet d'adresses"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
-msgid "_File"
-msgstr "_Fichier"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "_Imprimer..."
+#~ msgid "Find..."
+#~ msgstr "Rechercher..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Enregistrer"
+#~ msgid "Message Recipients"
+#~ msgstr "Destinataires du message"
 
-#.
-#. * 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 "ю propos de cette application"
+#~ msgid "Select Names"
+#~ msgstr "SИlectionnez des noms"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "ю propos..."
+#~ msgid "Select name from:"
+#~ msgstr "SИlectionnez un nom depuis :"
 
-#: po/tmp/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "Actio_ns"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "_Vider"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "Co_uper"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Vider"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Vide la sИlection"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Ferme ce rendez-vous"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copier"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Copie la sИlection"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Couper"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Coupe la sИlection"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr ""
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution-event-editor.xml.h:26
-#, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Copier vers le dossier"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution-event-editor.xml.h:31
-#, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Faire suivre"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution-event-editor.xml.h:38
-#, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "AperГu Avant Impression"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#~ msgid "Blank forms at end:"
+#~ msgstr "Formulaires blancs Ю la fin :"
 
-#: po/tmp/evolution-event-editor.xml.h:41
-#, fuzzy
-msgid "FIXME: Rec_urrence..."
-msgstr "RИcurrence"
+#~ msgid "Body"
+#~ msgstr "Corps"
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#~ msgid "Bottom:"
+#~ msgstr "Bas :"
 
-#: po/tmp/evolution-event-editor.xml.h:43
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Enregistrer la piХce-jointe"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensions :"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#~ msgid "Font..."
+#~ msgstr "Police..."
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Fonts"
+#~ msgstr "Polices"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr ""
+#~ msgid "Footer:"
+#~ msgstr "Pied de page :"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-#, fuzzy
-msgid "FIXME: _File..."
-msgstr "_Filtres de message..."
+#~ msgid "Header"
+#~ msgstr "En-tЙte"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-#, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Police..."
+#~ msgid "Header/Footer"
+#~ msgstr "En-tЙte/Pied de page"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
+#~ msgid "Headings"
+#~ msgstr "En-tЙtes"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#~ msgid "Headings for each letter"
+#~ msgstr "En-tЙtes pour chaque lettre"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "EntrИe de journal - %s"
+#~ msgid "Height:"
+#~ msgstr "Hauteur :"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#~ msgid "Immediately follow each other"
+#~ msgstr "Se suivre immИdiatement l'un l'autre"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "иditer le message"
+#~ msgid "Include:"
+#~ msgstr "Inclure :"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "Landscape"
+#~ msgstr "Paysage"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-#, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "_Aller au dossier"
+#~ msgid "Left:"
+#~ msgstr "Gauche :"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Nouveau rendez-vous..."
+#~ msgid "Letter tabs on side"
+#~ msgstr "SИlecteurs de lettre sur le cotИ"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#~ msgid "Margins"
+#~ msgstr "Marges"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#~ msgid "Number of columns:"
+#~ msgstr "Nombre de colonnes :"
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#~ msgid "Options"
+#~ msgstr "Options"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr ""
+#~ msgid "Orientation"
+#~ msgstr "Orientation"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "Page"
+#~ msgstr "Page"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#~ msgid "Paper"
+#~ msgstr "Papier"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#~ msgid "Paper source:"
+#~ msgstr "Source de papier :"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "Portrait"
+#~ msgstr "Portrait"
+
+#~ msgid "Preview:"
+#~ msgstr "AperГu :"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Imprimer en utilisant un ombrage gris"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Retourner sur les pages paires"
+
+#~ msgid "Right:"
+#~ msgstr "Droite :"
+
+#~ msgid "Sections:"
+#~ msgstr "Sections :"
+
+#~ msgid "Shading"
+#~ msgstr "Ombrage"
+
+#~ msgid "Start on a new page"
+#~ msgstr "DИmarrer sur une nouvelle page"
+
+#~ msgid "Style name:"
+#~ msgstr "Nom du style :"
+
+#~ msgid "Top:"
+#~ msgstr "Haut :"
+
+#~ msgid "Type:"
+#~ msgstr "Type :"
+
+#~ msgid "Width:"
+#~ msgstr "Largeur :"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr ""
+#~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
+
+#~ msgid "Edit appointment"
+#~ msgstr "иditer le rendez-vous"
+
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "DurИe de la sieste (minutes)"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minutes"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minutes"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 heures (am/pm)"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minutes"
+
+#~ msgid "24 hour"
+#~ msgstr "24 heures"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minutes"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minutes"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Expiration des alarmes aprХs"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Alarmes auditives"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Biper quand les fenЙtres d'alarme apparaissent."
+
+#~ msgid "Calendar"
+#~ msgstr "Calendrier"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "PrИfИrences du calendrier"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Compresser les week-ends"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Options du navigateur de date"
+
+#~ msgid "Defaults"
+#~ msgstr "DИfauts"
+
+#~ msgid "Display options"
+#~ msgstr "Options d'affichage"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activer la sonnerie pour"
+
+#~ msgid "End of day:"
+#~ msgstr "Fin de la journИe :"
+
+#~ msgid "First day of week:"
+#~ msgstr "Premier jour de la semaine :"
+
+#~ msgid "Highlight"
+#~ msgstr "Mettre en Иvidence"
+
+#~ msgid "Items Due Today"
+#~ msgstr "иlИments s'achevant aujourd'hui"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "иlИments expirant aujourd'hui : "
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "иlИments pas encore expirИs"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "иlИments pas encore expirИs :"
+
+#~ msgid "Overdue Items"
+#~ msgstr "иlИments en retard"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "иlИments en retard :"
+
+#~ msgid "Pick a color"
+#~ msgstr "Choisissez une couleur"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Me rappeler de tous les rendez-vous"
+
+#~ msgid "Reminders"
+#~ msgstr "Alarmes"
+
+#~ msgid "Show"
+#~ msgstr "Afficher"
+
+#~ msgid "Show appointment end times"
+#~ msgstr "Afficher l'heure de fin des rendez-vous"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Afficher les numИros de semaine"
+
+#~ msgid "Start of day:"
+#~ msgstr "DИbut de la journИe :"
+
+#~ msgid "TaskPad"
+#~ msgstr "TБchePad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "DurИe avant ИchИance"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Divisions du temps :"
+
+#~ msgid "Time format:"
+#~ msgstr "Format de date :"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuelles"
+
+#~ msgid "Work week"
+#~ msgstr "Semaine de travail"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutes avant leur dИbut."
+
+#~ msgid "seconds."
+#~ msgstr "secondes."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_lИtИ :"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassification :"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Date d'achХvement :"
+
+#~ msgid "High"
+#~ msgstr "Haute"
+
+#~ msgid "In Progress"
+#~ msgstr "En cours"
+
+#~ msgid "Low"
+#~ msgstr "Basse"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Not Started"
+#~ msgstr "Non dИmarrИe"
+
+#~ msgid "Task"
+#~ msgstr "TБche"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Contacts..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "_Date d'expiration :"
+
+#~ msgid "_Priority:"
+#~ msgstr "_PrioritИ :"
+
+#~ msgid "_Status:"
+#~ msgstr "_иtat :"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
 #, fuzzy
-msgid "F_ormat"
-msgstr "Format"
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "Ne peut crИer un calendrier dans `%s'"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#~ msgid "A_ll day event"
+#~ msgstr "_Toute la journИe"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#~ msgid "Appointment Basics"
+#~ msgstr "Rendez-vous ИlИmentaires"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "RИcurrence personnalisИe"
+
+#~ msgid "Days"
+#~ msgstr "Jours"
+
+#~ msgid "Every"
+#~ msgstr "Tou(te)s les"
+
+#~ msgid "Exceptions"
+#~ msgstr "Exceptions"
+
+#~ msgid "Hours"
+#~ msgstr "Heures"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Cou_rrier Ю :"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutes"
+
+#~ msgid "Modify"
+#~ msgstr "Modifier"
+
+#~ msgid "No recurrence"
+#~ msgstr "Aucune rИcurrence"
+
+#~ msgid "Preview"
+#~ msgstr "AperГu"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vИ"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#~ msgid "Recurrence"
+#~ msgstr "RИcurrence"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "RХgle de rИcurrence"
+
+#~ msgid "Reminder"
+#~ msgstr "Alarme"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "RИcurrence simple"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "RИsu_mИ :"
+
+#~ msgid "Time"
+#~ msgstr "Horaire"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidentiel"
+
+#~ msgid "_Contacts"
+#~ msgstr "_Contacts"
+
+#~ msgid "_Display"
+#~ msgstr "_Affichage"
+
+#~ msgid "_End time:"
+#~ msgstr "Heure de _fin :"
+
+#~ msgid "_Mail"
+#~ msgstr "_Courrier"
+
+#~ msgid "_Program"
+#~ msgstr "_Programme"
+
+#~ msgid "_Run program:"
+#~ msgstr "_Lancer le programme :"
+
+#~ msgid "_Start time:"
+#~ msgstr "Heure de _dИbut :"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Date de _dИbut :"
+
+#~ msgid "day(s)"
+#~ msgstr "jour(s)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "pour"
+
+#~ msgid "forever"
+#~ msgstr "toujours"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "mois"
+
+#~ msgid "until"
+#~ msgstr "jusqu'Ю"
+
+#~ msgid "week(s)"
+#~ msgstr "semaine(s)"
+
+#~ msgid "year(s)"
+#~ msgstr "annИe(s)"
+
+#~ msgid "Could not load the calendar in `%s'"
+#~ msgstr "Ne peut charger le calendrier dans `%s'"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Ne peut crИer un calendrier dans `%s'"
 
-#: po/tmp/evolution-event-editor.xml.h:70
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Va Ю la date actuelle"
+#~ msgid "April"
+#~ msgstr "avril"
 
-#: po/tmp/evolution-event-editor.xml.h:71
 #, fuzzy
-msgid "Go to the previous item"
-msgstr "Va Ю la date actuelle"
+#~ msgid "August"
+#~ msgstr "aout"
 
-#: po/tmp/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "PropriИtИs de la Liste 'ю Faire'"
+#~ msgid "December"
+#~ msgstr "dИcembre"
 
-#: po/tmp/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "Suivant"
+#~ msgid "February"
+#~ msgstr "fИvrier"
 
-#: po/tmp/evolution-event-editor.xml.h:75
 #, fuzzy
-msgid "Paste"
-msgstr "Page"
+#~ msgid "Go To Date"
+#~ msgstr "Aller Ю la date"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr ""
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Aller Ю aujourd'hui"
 
-#: po/tmp/evolution-event-editor.xml.h:77
 #, fuzzy
-msgid "Pre_vious"
-msgstr "PrИc"
+#~ msgid "January"
+#~ msgstr "janvier"
 
-#: po/tmp/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "PrИc"
+#~ msgid "July"
+#~ msgstr "juillet"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Configuration de l'impr_ession..."
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "juin"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Configuration de l'impression"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "mars"
 
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "PropriИtИs"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Lundi"
 
-#: po/tmp/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "Radio"
+#~ msgid "November"
+#~ msgstr "novembre"
 
-#: po/tmp/evolution-event-editor.xml.h:85
 #, fuzzy
-msgid "Redo the undone action"
-msgstr "Supprimer l'action"
+#~ msgid "October"
+#~ msgstr "octobre"
 
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Remplacer"
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "septembre"
 
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Remplace une chaНne"
+#~ msgid "Server disconnected."
+#~ msgstr "Serveur dИconnectИ."
 
-#: 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"
+#~ msgid "Attachment properties"
+#~ msgstr "PropriИtИs de la piХce-jointe"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
-#, fuzzy
-msgid "Save the current file"
-msgstr "la date actuelle"
+#~ msgid "File name:"
+#~ msgstr "Nom du fichier : "
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#~ msgid "MIME type:"
+#~ msgstr "Type MIME : "
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#~ msgid "Edit VFolders"
+#~ msgstr "иditer les dossiers virtuels"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "Filter Rules"
+#~ msgstr "RХgles de Filtrage"
 
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#~ msgid "Incoming"
+#~ msgstr "Entrant"
+
+#~ msgid "Outgoing"
+#~ msgstr "Sortant"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Dossiers Virtuels"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "Sources de Dossier Virtuel"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrer"
+
+#~ msgid "Show all hidden"
+#~ msgstr "Afficher tous les cachИs"
+
+#~ msgid "Hide selected"
+#~ msgstr "Cacher sИlectionnИ"
+
+#~ msgid "Hide read"
+#~ msgstr "Cacher lu"
+
+#~ msgid "Hide deleted"
+#~ msgstr "Cacher supprimИ"
+
+#~ msgid "Hide Subject"
+#~ msgstr "Cacher Sujet"
+
+#~ msgid "Hide from Sender"
+#~ msgstr "Cacher de l'expИditeur"
+
+#~ msgid "Hide Messages"
+#~ msgstr "Cacher les messages"
+
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Cacher le sujet \"%s\""
+
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "Cacher depuis l'expИditeur <%s>"
 
-#: po/tmp/evolution-event-editor.xml.h:97
 #, fuzzy
-msgid "Search for a string"
-msgstr "_Rechercher des contacts"
+#~ msgid "Current store format:"
+#~ msgstr "Ne peut dИmarrer wombat"
 
-#: po/tmp/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "SИlectionnez _tout"
+#~ msgid "New store format:"
+#~ msgstr "Type de sources de nouvelles :"
 
-#: po/tmp/evolution-event-editor.xml.h:100
 #, fuzzy
-msgid "Select everything"
-msgstr "SИlectionnez un Dossier"
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Vous n'avez pas de source de courrier configurИ"
 
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
+#~ msgid "Account"
+#~ msgstr "Compte"
 
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#~ msgid "Account Information"
+#~ msgstr "Information du compte"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "ю _propos..."
+#~ msgid "Account Management"
+#~ msgstr "Gestionnaire de comptes"
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Fermer"
+#~ msgid "Account Properties"
+#~ msgstr "PropriИtИs du compte"
 
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Copier"
+#~ msgid "Advanced"
+#~ msgstr "AvancИe"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "Authentication"
+#~ msgstr "Identification"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_иdition"
+#~ msgid "Authentication Type:"
+#~ msgstr "Type d'identification :"
 
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Rechercher..."
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "FИlicitations, votre configuration de messagerie est effectuИ.\n"
 
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formulaires"
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Aide"
+#~ msgid "Done"
+#~ msgstr "Fait"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Insertion"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Adresse Иlectronique :"
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Sujet"
+#~ msgid "Email Address:"
+#~ msgstr "Adresse Иlectronique :"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configuration de la messagerie Evolution"
+
+#~ msgid "Full Name:"
+#~ msgstr "Nom complet :"
+
+#~ msgid "Hostname:"
+#~ msgstr "Nom d'hТte :"
+
+#~ msgid "Identity"
+#~ msgstr "IdentitИ"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "Courrier"
+
+#~ msgid "Mail Account"
+#~ msgstr "Compte de messagerie"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Configuration de la messagerie"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Assistant de configuration de messagerie"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Divers"
+
+#~ msgid "News"
+#~ msgstr "Nouvelles"
+
+#~ msgid "Optional"
+#~ msgstr "Optionnel"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisation :"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Serveur de courrier sortant"
+
+#~ msgid "Password:"
+#~ msgstr "Mot de passe :"
+
+#~ msgid "Plain Text"
+#~ msgstr "Texte plein"
+
+#~ msgid "Receiving Email"
+#~ msgstr "RИception des messages"
+
+#~ msgid "Remember my password"
+#~ msgstr "Se souvenir de mon mot de passe"
+
+#~ msgid "Reply-to:"
+#~ msgstr "RИpondre-Ю :"
+
+#~ msgid "Required"
+#~ msgstr "Requis"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Enregistrer le mot de passe"
+
+#~ msgid "Select signature file"
+#~ msgstr "SИlectionner un fichier de signature"
+
+#~ msgid "Sending Email"
+#~ msgstr "Envoie du message"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Configuration du serveur"
+
+#~ msgid "Server Type: "
+#~ msgstr "Type de serveur : "
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Le serveur nИcessite une identification"
+
+#~ msgid "Servers"
+#~ msgstr "Serveurs"
+
+#~ msgid "Signature file:"
+#~ msgstr "Fichier de signature :"
+
+#~ msgid "Signature:"
+#~ msgstr "Signature :"
+
+#~ msgid "Sources"
+#~ msgstr "Sources"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Ce serveur nИcessite une connexion sИcurisИ (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
+#~ "\"Travail\" ou \"Maison\"."
+
+#~ msgid "User Information"
+#~ msgstr "Information utilisateur"
+
+#~ msgid "Username:"
+#~ msgstr "Nom d'utilisateur :"
+
+#~ msgid " for "
+#~ msgstr " pour "
+
+#~ msgid "Delete a contact"
+#~ msgstr "Supprimer le contact"
+
+#~ msgid "Find"
+#~ msgstr "Rechercher"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "Print contacts"
+#~ msgstr "Imprimer les contacts"
+
+#~ msgid "Stop"
+#~ msgstr "ArrЙter"
+
+#~ msgid "Stop Loading"
+#~ msgstr "ArrЙte le chargement"
+
+#~ msgid "View All"
+#~ msgstr "Tout voir"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Coller"
+#~ msgid "View all contacts"
+#~ msgstr "Voir tous les contacts"
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Imprimer"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configuration du carnet d'_adresses..."
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_PropriИtИs..."
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimer les contacts..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Rechercher des contacts"
+
+#~ msgid "5 Days"
+#~ msgstr "5 jours"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Modifier les prИfИrences"
 
-#: po/tmp/evolution-event-editor.xml.h:119
 #, fuzzy
-msgid "_Redo"
-msgstr "Radio"
+#~ msgid "Ca_lendar"
+#~ msgstr "Calendrier"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Remplacer..."
+#~ msgid "Calendar Preferences..."
+#~ msgstr "PrИfИrences du calendrier..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "Barres d'_outils"
+#~ msgid "Create a new appointment"
+#~ msgstr "CrИe un nouveau rendez-vous"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_DИfaire"
+#~ msgid "Create a new calendar"
+#~ msgstr "CrИe un nouveau calendrier"
 
-#.
-#. * 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 "Composer"
+#~ msgid "Day"
+#~ msgstr "Jour"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Compose un nouveau message"
+#~ msgid "Go back in time"
+#~ msgstr "Recule dans le temps"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Copie le message vers un nouveau dossier"
+#~ msgid "Go forward in time"
+#~ msgstr "Avance dans le temps"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "D_ossier"
+#~ msgid "Go to"
+#~ msgstr "Aller Ю"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrer sur l'expИditeur"
+#~ msgid "Go to a specific date"
+#~ msgstr "Va Ю une date prИcise"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtrer sur les _destinataires"
+#~ msgid "Go to present time"
+#~ msgstr "Va Ю la date actuelle"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Oublier les _mots de passe"
+#~ msgid "Month"
+#~ msgstr "Mois"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "RИcupИrer"
+#~ msgid "Open a calendar"
+#~ msgstr "Ouvre un calendrier"
+
+#~ msgid "Prev"
+#~ msgstr "PrИc"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Imprime ce calendrier"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Affiche une journИe"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Affiche un mois"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Affiche une semaine"
+
+#~ msgid "Show the working week"
+#~ msgstr "Affiche une semaine de travail"
+
+#~ msgid "Week"
+#~ msgstr "Semaine"
+
+#~ msgid "_New"
+#~ msgstr "_Nouveau"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Ouvrir un calendrier"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimer ce calendrier"
+
+#~ msgid "_Save As..."
+#~ msgstr "Enregistrer _sous..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Supprimer cet ИlИment"
+
+#~ msgid "Delete..."
+#~ msgstr "Supprimer..."
+
+#~ msgid "Help"
+#~ msgstr "Aide"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Imprimer une en_veloppe..."
+
+#~ msgid "Print this item"
+#~ msgstr "Imprime cet ИlИment"
+
+#~ msgid "Print..."
+#~ msgstr "Imprimer..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Enregistrer _sous..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Enregistrer et Quitter"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+
+#~ msgid "See online help"
+#~ msgstr "Voir l'aide en ligne"
+
+#~ msgid "_File"
+#~ msgstr "_Fichier"
+
+#~ msgid "_Print..."
+#~ msgstr "_Imprimer..."
+
+#~ msgid "_Save"
+#~ msgstr "_Enregistrer"
+
+#~ msgid "About this application"
+#~ msgstr "ю propos de cette application"
+
+#~ msgid "About..."
+#~ msgstr "ю propos..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Vider"
+
+#~ msgid "C_ut"
+#~ msgstr "Co_uper"
+
+#~ msgid "Clear"
+#~ msgstr "Vider"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Vide la sИlection"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Ferme ce rendez-vous"
+
+#~ msgid "Copy"
+#~ msgstr "Copier"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copie la sИlection"
+
+#~ msgid "Cut"
+#~ msgstr "Couper"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Coupe la sИlection"
 
-#: po/tmp/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Supprimer le message"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "RИcurrence"
 
-#: po/tmp/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Message suivi - %s"
+#~ msgid "Modify the file's properties"
+#~ msgstr "PropriИtИs de la Liste 'ю Faire'"
 
-#: po/tmp/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Imprime le message sИlectionnИ"
+#~ msgid "N_ext"
+#~ msgstr "Suivant"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr "_Filtres de message..."
+#, fuzzy
+#~ msgid "Paste"
+#~ msgstr "Page"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr "GИrer les abonnements..."
+#~ msgid "Print S_etup..."
+#~ msgstr "Configuration de l'impr_ession..."
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "_Marquer comme lus"
+#~ msgid "Print Setup"
+#~ msgstr "Configuration de l'impression"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Marquer comme _non lu"
+#~ msgid "Properties"
+#~ msgstr "PropriИtИs"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "DИplacer"
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Radio"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "DИplace le message vers un nouveau dossier"
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Supprimer l'action"
 
-#: po/tmp/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Visualise le message a imprimer"
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "AperГu avant impression du message..."
+#~ msgid "Replace a string"
+#~ msgstr "Remplace une chaНne"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Imprime le message vers l'imprimante"
+#, fuzzy
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Enregistrer le contact et fermer la boНte de dialogue"
 
-#: po/tmp/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Imprimer le message..."
+#, fuzzy
+#~ msgid "Save the current file"
+#~ msgstr "la date actuelle"
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "RИpondre Ю _tous"
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Rechercher des contacts"
 
-#: po/tmp/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "RИpondre Ю l'_expИditeur"
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "SИlectionnez _tout"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "SИlectionnez _tout"
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "SИlectionnez un Dossier"
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
+#~ msgid "_About..."
+#~ msgstr "ю _propos..."
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr "Afficher _tous les messages"
+#~ msgid "_Close"
+#~ msgstr "_Fermer"
 
-#: po/tmp/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Liste des messages par enfilade"
+#~ msgid "_Copy"
+#~ msgstr "_Copier"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "Dossier virtuel sur l'e_xpИditeur"
+#~ msgid "_Edit"
+#~ msgstr "_иdition"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "Dossier virtuel sur les de_stinataires"
+#~ msgid "_Find..."
+#~ msgstr "_Rechercher..."
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr "Voir la source brut du message"
+#~ msgid "_Help"
+#~ msgstr "_Aide"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Appliquer les filtres"
+#~ msgid "_Paste"
+#~ msgstr "_Coller"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Configuration du dossier..."
+#~ msgid "_Print"
+#~ msgstr "_Imprimer"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "_Copier vers le dossier..."
+#~ msgid "_Properties..."
+#~ msgstr "_PropriИtИs..."
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_иditer le message"
+#, fuzzy
+#~ msgid "_Redo"
+#~ msgstr "Radio"
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Nettoyer"
+#~ msgid "_Replace..."
+#~ msgstr "_Remplacer..."
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "_Filtrer sur le sujet"
+#~ msgid "_Undo"
+#~ msgstr "_DИfaire"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Faire suivre"
+#~ msgid "Compose"
+#~ msgstr "Composer"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Inverser la sИlection"
+#~ msgid "Compose a new message"
+#~ msgstr "Compose un nouveau message"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "Configuration de la _messagerie..."
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copie le message vers un nouveau dossier"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Message"
+#~ msgid "F_older"
+#~ msgstr "D_ossier"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "_DИplacer vers le dossier..."
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrer sur l'expИditeur"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Ouvrir dans une nouvelle fenЙtre"
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtrer sur les _destinataires"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Imprimer le message"
+#~ msgid "Forget _Passwords"
+#~ msgstr "Oublier les _mots de passe"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "_Enregistrer le message sous..."
+#~ msgid "Get Mail"
+#~ msgstr "RИcupИrer"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Source"
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Supprimer le message"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_Enfiler"
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "Message suivi - %s"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_RИcupИrer"
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Imprime le message sИlectionnИ"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_Dossier Virtuel sur le sujet"
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtres de message..."
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "иditeur de dossier _virtuel..."
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "GИrer les abonnements..."
 
-#.
-#. * 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 "Joindre"
+#~ msgid "Mar_k As Read"
+#~ msgstr "_Marquer comme lus"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Ferme le fichier en cours"
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marquer comme _non lu"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Encrypter le message avec PGP"
+#~ msgid "Move"
+#~ msgstr "DИplacer"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Move message to a new folder"
+#~ msgstr "DИplace le message vers un nouveau dossier"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "InsХre un fichier comme texte dans le message"
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Visualise le message a imprimer"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "EnsИrer un fichier texte..."
+#~ msgid "Print Preview of message..."
+#~ msgstr "AperГu avant impression du message..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Ouvrir un fichier"
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprime le message vers l'imprimante"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "Encrypter avec PGP"
+#~ msgid "Print message..."
+#~ msgstr "Imprimer le message..."
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "Signer avec PGP"
+#~ msgid "Reply to _All"
+#~ msgstr "RИpondre Ю _tous"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Enregistrer sous"
+#~ msgid "Reply to _Sender"
+#~ msgstr "RИpondre Ю l'_expИditeur"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+#~ msgid "Select _All"
+#~ msgstr "SИlectionnez _tout"
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "Enregistrer dans le dossier..."
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
 
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "Enregistrer le fichier en cours avec un nom diffИrent"
+#~ msgid "Show _All messages"
+#~ msgstr "Afficher _tous les messages"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Enregistrer le message dans un dossier spИcifiИ"
+#~ msgid "Threaded Message list"
+#~ msgstr "Liste des messages par enfilade"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Envoyer"
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Dossier virtuel sur l'e_xpИditeur"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Envoyer plus _tard"
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Dossier virtuel sur les de_stinataires"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Envoyer plus _tard"
+#~ msgid "View Raw Message Source"
+#~ msgstr "Voir la source brut du message"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "Envoie le message au format HTML"
+#~ msgid "_Apply Filters"
+#~ msgstr "_Appliquer les filtres"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Envoie le message plus tard"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copier vers le dossier..."
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "Envoie le message maintenant"
+#~ msgid "_Edit Message"
+#~ msgstr "_иditer le message"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "Envoyer ce message maintenant"
+#~ msgid "_Expunge"
+#~ msgstr "_Nettoyer"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "Afficher / Cacher les piХces-jointes"
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrer sur le sujet"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Afficher les _piХces-jointes"
+#~ msgid "_Forward"
+#~ msgstr "_Faire suivre"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "Afficher les piХces-jointes"
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverser la sИlection"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr "Signer ce message avec votre clИ PGP"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configuration de la _messagerie..."
 
-#: po/tmp/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "_InsИrer un fichier texte... (FIXME)"
+#~ msgid "_Message"
+#~ msgstr "_Message"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Ouvrir..."
+#~ msgid "_Move to Folder..."
+#~ msgstr "_DИplacer vers le dossier..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr "_SИcuritИ"
+#~ msgid "_Open in New Window"
+#~ msgstr "_Ouvrir dans une nouvelle fenЙtre"
 
-#.
-#. * 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 "Ajouter le dossier Ю votre liste de dossier abonnИs"
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimer le message"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "RafraНchir la liste"
+#~ msgid "_Save Message As..."
+#~ msgstr "_Enregistrer le message sous..."
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "RafraНchi la liste de dossiers"
+#~ msgid "_Source"
+#~ msgstr "_Source"
 
-#: 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"
+#~ msgid "_Threaded"
+#~ msgstr "_Enfiler"
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "S'abonner"
+#~ msgid "_Undelete"
+#~ msgstr "_RИcupИrer"
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Se dИsabonner"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Dossier Virtuel sur le sujet"
 
-#.
-#. * 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 "Afficher un dossier diffИrent"
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "иditeur de dossier _virtuel..."
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "_Quitter"
+#~ msgid "Attach"
+#~ msgstr "Joindre"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Barre de _raccourcis d'Evolution"
+#~ msgid "Close the current file"
+#~ msgstr "Ferme le fichier en cours"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Quitte le programme"
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Encrypter le message avec PGP"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "PrЙt Ю _dИmarrer"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Afficher les informations concernant Evolution"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "InsХre un fichier comme texte dans le message"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Afficher la barre de _dossiers"
+#~ msgid "Insert text file..."
+#~ msgstr "EnsИrer un fichier texte..."
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Afficher la barre de _raccourcis"
+#~ msgid "Open a file"
+#~ msgstr "Ouvrir un fichier"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "_Transmettre un rapport d'anomalies"
+#~ msgid "PGP Encrypt"
+#~ msgstr "Encrypter avec PGP"
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
+#~ msgid "PGP Sign"
+#~ msgstr "Signer avec PGP"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Commute l'affichage de la barre de dossiers"
+#~ msgid "Save As"
+#~ msgstr "Enregistrer sous"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Commute l'affichage de la barre de raccourcis"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "Utilisation du gestionnaire de c_ontact"
+#~ msgid "Save in folder..."
+#~ msgstr "Enregistrer dans le dossier..."
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Utilisation du _calendrier"
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Enregistrer le fichier en cours avec un nom diffИrent"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Utilisation de la _messagerie"
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Enregistrer le message dans un dossier spИcifiИ"
 
-#: po/tmp/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "ю _propos d'Evolution..."
+#~ msgid "Send"
+#~ msgstr "Envoyer"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Rendez-vous (FIXME)"
+#~ msgid "Send _Later"
+#~ msgstr "Envoyer plus _tard"
 
-#: po/tmp/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#~ msgid "Send _later"
+#~ msgstr "Envoyer plus _tard"
 
-#: po/tmp/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Dossier"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Envoie le message au format HTML"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Aller au dossier..."
+#~ msgid "Send the message later"
+#~ msgstr "Envoie le message plus tard"
 
-#: po/tmp/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Index"
+#~ msgid "Send the message now"
+#~ msgstr "Envoie le message maintenant"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "_Message Иlectronique (FIXME)"
+#~ msgid "Send this message now"
+#~ msgstr "Envoyer ce message maintenant"
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_RИglages"
+#~ msgid "Show / hide attachments"
+#~ msgstr "Afficher / Cacher les piХces-jointes"
 
-#: po/tmp/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_TБche (FIXME)"
+#~ msgid "Show _attachments"
+#~ msgstr "Afficher les _piХces-jointes"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
+#~ msgid "Show attachments"
+#~ msgstr "Afficher les piХces-jointes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Essai"
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Signer ce message avec votre clИ PGP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "OccupИ"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_InsИrer un fichier texte... (FIXME)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Hors du bureau"
+#~ msgid "_Open..."
+#~ msgstr "_Ouvrir..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Pas d'information"
+#~ msgid "_Security"
+#~ msgstr "_SИcuritИ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Inviter d'autres personnes..."
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Ajouter le dossier Ю votre liste de dossier abonnИs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Options"
+#~ msgid "Refresh List"
+#~ msgstr "RafraНchir la liste"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Afficher _seulement les heures de travail"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "RafraНchi la liste de dossiers"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Afficher _ZommИ arriХre"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Supprimer le dossier de votre liste de dossier abonnИs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Mettre Ю jour Libre/OccupИ"
+#~ msgid "Subscribe"
+#~ msgstr "S'abonner"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Unsubscribe"
+#~ msgstr "Se dИsabonner"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Choix automatique"
+#~ msgid "Display a different folder"
+#~ msgstr "Afficher un dossier diffИrent"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "E_xit"
+#~ msgstr "_Quitter"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Toutes les personnes et ressources"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barre de _raccourcis d'Evolution"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Toute les _personnes et une ressource"
+#~ msgid "Exit the program"
+#~ msgstr "Quitte le programme"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personnes _nИcessaires"
+#~ msgid "Getting _Started"
+#~ msgstr "PrЙt Ю _dИmarrer"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personnes nИcessaires et _une ressource"
+#~ msgid "Show information about Evolution"
+#~ msgstr "Afficher les informations concernant Evolution"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Heure de _dИbut de la rИunion :"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Afficher la barre de _dossiers"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Heure de _fin de la rИunion :"
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Transmettre un rapport d'anomalies"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tout les invitИs"
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Commute l'affichage de la barre de dossiers"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Utilisation du gestionnaire de c_ontact"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Maintenant"
+#~ msgid "Using the _Calendar"
+#~ msgstr "Utilisation du _calendrier"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Using the _Mailer"
+#~ msgstr "Utilisation de la _messagerie"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "_About Evolution..."
+#~ msgstr "ю _propos d'Evolution..."
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Groupe %i"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Rendez-vous (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Dossier"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Aller au dossier..."
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_Message Иlectronique (FIXME)"
+
+#~ msgid "_Settings"
+#~ msgstr "_RИglages"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_TБche (FIXME)"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -7045,9 +6772,6 @@ msgstr "Groupe %i"
 #~ msgid "Testing \"%s\""
 #~ msgstr "Test de \"%s\""
 
-#~ msgid "Test connection to \"%s\""
-#~ msgstr "Test de connexion Ю \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "La connexion est concluante !"
 
@@ -7078,15 +6802,9 @@ msgstr "Groupe %i"
 #~ msgid "News Sources"
 #~ msgstr "Sources de forums"
 
-#~ msgid "Organization"
-#~ msgstr "Organisation"
-
 #~ msgid "Send messages in HTML format"
 #~ msgstr "Envoie les messages au format HTML"
 
-#~ msgid "categories"
-#~ msgstr "catИgories"
-
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "иlement(s) appartenant Ю ces catИgories : "
 
@@ -7476,9 +7194,6 @@ msgstr "Groupe %i"
 #~ msgid "End on "
 #~ msgstr "Fin le "
 
-#~ msgid "End after"
-#~ msgstr "Fin aprИs"
-
 #~ msgid "Change"
 #~ msgstr "Changer"
 
@@ -7550,9 +7265,6 @@ msgstr "Groupe %i"
 #~ msgid "Preferences"
 #~ msgstr "PrИfИrences"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmes"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Biper lors de l'affichage des alarmes"
 
@@ -7574,13 +7286,6 @@ msgstr "Groupe %i"
 #~ 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"
 
@@ -7602,9 +7307,6 @@ msgstr "Groupe %i"
 #~ 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."
 
diff --git a/po/ga.po b/po/ga.po
index eb4be72493..c63667fcf6 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Alastair McKinstry, <mckinstry@computer.org>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -15,197 +15,361 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+msgid "Cannot initialize Evolution's Executive Summary component."
+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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Post an sceАl seo"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Post"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, c-format
+msgid "Close %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "FillteАn _Nua"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "FillteАn _Nua"
+
+#: executive-summary/component/e-summary.c:919
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:933
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr ""
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "New"
+msgstr "_Nua"
+
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr ""
+
+#: notes/component-factory.c:152
+msgid "Cannot initialize Evolution's notes component."
+msgstr ""
+
+#: notes/main.c:30
+msgid "Notes Component: Could not initialize bonobo"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -221,29 +385,18 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-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.
@@ -359,40 +512,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/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.
@@ -402,7 +547,7 @@ msgid "_Add"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 #, fuzzy
 msgid "_Delete"
 msgstr "ScrМos"
@@ -416,14 +561,7 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -482,7 +620,6 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -500,8 +637,6 @@ msgid "_Address..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr ""
 
@@ -547,24 +682,27 @@ msgid "No_tes:"
 msgstr "_Nota"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -573,6 +711,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr ""
 
@@ -583,28 +722,33 @@ msgstr "Greamaigh"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr ""
 
@@ -613,10 +757,12 @@ msgid "Other Fax"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 #, fuzzy
 msgid "Primary"
 msgstr "TosaМocht"
@@ -634,62 +780,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/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.
@@ -743,12 +843,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -773,27 +868,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -819,9 +914,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr ""
 
@@ -854,12 +949,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr ""
 
@@ -877,12 +970,10 @@ msgid "Search Scope:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr ""
 
@@ -905,192 +996,83 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "ScrМos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "FillteАn _Nua"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "o"
-msgstr "Do"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr ""
+msgid "Email"
+msgstr "Post"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_FillteАn"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1099,183 +1081,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:15
-#, fuzzy
-msgid "Format"
-msgstr "Sheoladh Chuig duine"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:34
-#, fuzzy
-msgid "Portrait"
-msgstr "TosaМocht"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:41
-#, fuzzy
-msgid "Size:"
-msgstr "MИid"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:44
-#, fuzzy
-msgid "Top:"
-msgstr "Do:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1284,13 +1089,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1302,69 +1107,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-msgid "Calendar Server"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 #, fuzzy
 msgid "Snooze"
 msgstr "MИid"
@@ -1375,25 +1128,25 @@ msgstr "MИid"
 msgid "Ok"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1401,61 +1154,58 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 #, fuzzy
 msgid "Private"
 msgstr "PriontАil"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1464,7 +1214,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1472,865 +1222,421 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:224
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
-msgid "Loading Calendar"
+#: calendar/gui/calendar-summary.c:484
+msgid "Display"
 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/calendar-summary.c:489
 #, fuzzy
-msgid "Edit appointment"
+msgid "Show appointments"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "TosaМocht"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
+#: calendar/gui/calendar-summary.c:497
+msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-#, fuzzy
-msgid "Sunday"
-msgstr "Post"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#, fuzzy
-msgid "TaskPad"
-msgstr "_Teacs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/calendar-summary.c:583
+msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
 msgstr ""
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-#, fuzzy
-msgid "None"
-msgstr "_Nota"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:158
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#, fuzzy
-msgid "Task"
-msgstr "_Teacs"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#, fuzzy
-msgid "_Priority:"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
 msgstr "TosaМocht"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr ""
-
-#: calendar/gui/dialogs/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:331
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "_Coinne"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Post"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Open..."
 msgstr "_OscАil"
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "ScrМos"
+
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Delete the task"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 #, fuzzy
 msgid "New appointment..."
 msgstr "_Coinne"
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "_Coinne"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
+#: calendar/gui/e-tasks.c:285
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:331
 #, fuzzy
-msgid "Pri_vate"
-msgstr "PriontАil"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr ""
+msgid "Edit Appointment"
+msgstr "_Coinne"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:441
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "_Coinne"
-
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
+msgid "Sunday"
+msgstr "Post"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
+#: calendar/gui/gnome-cal.c:696
 #, c-format
-msgid "Could not load the calendar in `%s'"
+msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "Could not create a calendar in `%s'"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "April"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:15
-msgid "March"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:16
-msgid "May"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:18
-msgid "October"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
 msgstr ""
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr ""
 
@@ -2524,10 +1830,14 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr ""
 
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2618,78 +1928,84 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2705,40 +2021,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2750,25 +2067,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2776,13 +2093,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, 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)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2790,7 +2107,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2798,7 +2115,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3120,8 +2437,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3150,71 +2467,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -3263,130 +2579,123 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3429,12 +2738,11 @@ msgid "attachment"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "ScrМos"
 
@@ -3450,67 +2758,51 @@ msgstr ""
 msgid "Attach a file to the message"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 #, fuzzy
 msgid "From:"
 msgstr "с:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr ""
 
@@ -3521,92 +2813,88 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr ""
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
@@ -3732,7 +3020,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3832,189 +3120,169 @@ msgstr ""
 msgid "Read"
 msgstr "ScrМos"
 
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid "Edit VFolders"
-msgstr "_FillteАn"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr ""
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Assign Score"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "before"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Forward to Address"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "FillteАn _Nua"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr ""
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Abair"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "Move to Folder"
-msgstr "FillteАn _Nua"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "Sender"
-msgstr "Post"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Abair"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4032,10 +3300,6 @@ msgstr ""
 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 ""
@@ -4044,213 +3308,168 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr ""
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "FillteАn _Nua"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 #, fuzzy
 msgid "Subject contains"
 msgstr "Abair"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr ""
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "ScrМos"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Abair"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_OscАil"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr ""
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "PriontАil"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Post an sceАl seo"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Abair"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-msgid "Current store format:"
-msgstr ""
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+#, fuzzy
+msgid "None"
+msgstr "_Nota"
 
-#: mail/local-config.glade.h:7
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "Sheoladh Chuig duine"
+msgid " (default)"
+msgstr "ScrМos"
 
-#: mail/local-config.glade.h:8
-msgid "New store format:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
-
-#: mail/local-config.glade.h:10
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-msgid "mbox"
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
-msgid "mh"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+msgid "Evolution Account Editor"
 msgstr ""
 
 #: mail/mail-autofilter.c:71
@@ -4273,7 +3492,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4281,510 +3500,109 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Account Properties"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication Type:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "ScrМos"
-
-#: mail/mail-config-druid.glade.h:26
-msgid "Delete mail from server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "_Nota"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "E-Mail Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Email Address:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Full Name:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Hostname:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:41
-msgid "Mail Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "_Nua"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "_OscАil"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Freagrair"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Freagrair"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Save password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Select signature file"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Post"
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Server Type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Post"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Signature:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-msgid "User Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-msgid "minute(s)"
-msgstr ""
-
-#: mail/mail-config-gui.c:433
-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:446
-msgid "Full name:"
-msgstr ""
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr ""
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr ""
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr ""
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-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
-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: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"
-"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:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: 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
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr ""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr ""
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr ""
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr ""
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr ""
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr ""
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
 #: mail/mail-display.c:98
@@ -4821,66 +3639,67 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Freagrair"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4938,7 +3757,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -4963,159 +3782,159 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5126,7 +3945,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5230,112 +4049,188 @@ msgstr "FillteАn _Nua"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "ScrМos an sceal seo"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+msgid "Attachment"
+msgstr ""
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "с:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "ScrМos"
+
+#: mail/message-list.c:1110
+msgid "Received"
+msgstr ""
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Do:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "MИid"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "_FillteАn"
+
+#: mail/subscribe-dialog.c:63
+msgid "Store"
+msgstr ""
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5427,30 +4322,30 @@ msgstr ""
 msgid "New..."
 msgstr "_Nua"
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 #, fuzzy
 msgid "Go to folder..."
 msgstr "SАbhАil 'san _fillteАn"
@@ -5459,14 +4354,19 @@ msgstr "SАbhАil 'san _fillteАn"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 #, fuzzy
 msgid "Folders"
 msgstr "_FillteАn"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
 #, fuzzy, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
 
 #: shell/e-shell.c:372
@@ -5474,73 +4374,81 @@ msgstr "Evolution"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5548,13 +4456,12 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "_View"
 msgstr "_Nua"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr ""
 
@@ -5648,1275 +4555,660 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: ui/evolution-contact-editor.xml:7
 #, fuzzy
-msgid "New"
-msgstr "_Nua"
-
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr ""
+msgid "FIXME: _Appointment"
+msgstr "_Coinne"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_UirlisМ"
+#: ui/evolution-contact-editor.xml:10
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "_Post sceАl"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr ""
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "PriontАil"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
+#: ui/evolution-contact-editor.xml:63
+msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr ""
+#: ui/evolution-contact-editor.xml:72
+#, fuzzy
+msgid "_Object"
+msgstr "Abair"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nua"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-contact-editor.xml.h:7
-#, fuzzy
-msgid "Delete this item"
-msgstr "ScrМos an sceal seo"
-
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:104
 #, fuzzy
-msgid "Delete..."
-msgstr "ScrМos"
-
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr ""
+msgid "_Toolbars"
+msgstr "_UirlisМ"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-#, fuzzy
-msgid "Print..."
-msgstr "PriontАil"
-
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-#, fuzzy
-msgid "Save _As..."
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-#, fuzzy
-msgid "_File"
-msgstr "_FillteАn"
-
-#: ui/evolution-contact-editor.xml.h:20
-#, fuzzy
-msgid "_Print..."
-msgstr "PriontАil"
-
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9
+#: ui/evolution-contact-editor.xml:137
 #, fuzzy
-msgid "C_lear"
+msgid "_Forms"
 msgstr "_FillteАn"
 
-#: ui/evolution-event-editor.xml.h:10
+#: ui/evolution-contact-editor.xml:142
 #, fuzzy
-msgid "C_ut"
-msgstr "Gearr"
-
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Greamaigh"
-
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Gearr"
+msgid "FIXME: _New Contact"
+msgstr "_Coinne"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:31
+#: ui/evolution-contact-editor.xml:157
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_UirlisМ"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
+#. 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:2471
+msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_Post sceАl"
+msgid "_Options"
+msgstr "_OscАil"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Coinne"
-
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "PriontАil"
-
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr ""
+#~ msgid "Select name from:"
+#~ msgstr "FillteАn _Nua"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "ScrМos"
+#~ msgid "o"
+#~ msgstr "Do"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "Freagrair"
+#~ msgid "Format"
+#~ msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "LeasЗ"
-
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "Greamaigh"
-
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr ""
+#~ msgid "Portrait"
+#~ msgstr "TosaМocht"
 
-#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
-msgid "_Forms"
-msgstr "_FillteАn"
-
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr ""
+#~ msgid "Top:"
+#~ msgstr "Do:"
 
-#: ui/evolution-event-editor.xml.h:115
 #, fuzzy
-msgid "_Object"
-msgstr "Abair"
-
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr ""
+#~ msgid "Edit appointment"
+#~ msgstr "_Coinne"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "PriontАil"
+#~ msgid "TaskPad"
+#~ msgstr "_Teacs"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:122
 #, fuzzy
-msgid "_Toolbars"
-msgstr "_UirlisМ"
+#~ msgid "Task"
+#~ msgstr "_Teacs"
 
-#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
-msgid "_Undo"
-msgstr "LeasЗ"
+#~ msgid "_Priority:"
+#~ msgstr "TosaМocht"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "_FillteАn"
-
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr ""
+#~ msgid "Appointment Basics"
+#~ msgstr "_Coinne"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "ScrМos an sceal seo"
+#~ msgid "Pri_vate"
+#~ msgstr "PriontАil"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Post an sceАl seo"
+#~ msgid "Edit VFolders"
+#~ msgstr "_FillteАn"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "ScrМos an sceal seo"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#~ msgid "Hide deleted"
+#~ msgstr "ScrМos"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Move"
-msgstr "ScrМos"
-
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#~ msgid "Hide Subject"
+#~ msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "Post an sceАl seo"
-
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr ""
+#~ msgid "Hide Messages"
+#~ msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Post an sceАl seo"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:51
 #, fuzzy
-msgid "_Configure Folder"
-msgstr "FillteАn _Nua"
+#~ msgid "Mailbox Format"
+#~ msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "_Post sceАl"
+#~ msgid "Done"
+#~ msgstr "_Nota"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:57
 #, fuzzy
-msgid "_Forward"
-msgstr "Sheoladh Chuig duine"
-
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr ""
+#~ msgid "News"
+#~ msgstr "_Nua"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "_Post sceАl"
+#~ msgid "Optional"
+#~ msgstr "_OscАil"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "SАbhАil 'san _fillteАn"
+#~ msgid "Reply-to:"
+#~ msgstr "Freagrair"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "_Post sceАl"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr ""
+#~ msgid "Servers"
+#~ msgstr "Post"
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr ""
+#~ msgid "_New"
+#~ msgstr "_Nua"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "ScrМos"
-
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr ""
+#~ msgid "_Save As..."
+#~ msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Post an sceАl seo"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Delete this item"
+#~ msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
+#~ msgid "Delete..."
+#~ msgstr "ScrМos"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Post"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
+#~ msgid "Print..."
+#~ msgstr "PriontАil"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Post an sceАl seo"
+#~ msgid "Save _As..."
+#~ msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Post an sceАl seo"
+#~ msgid "_File"
+#~ msgstr "_FillteАn"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Post an sceАl seo"
-
-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr ""
+#~ msgid "_Print..."
+#~ msgstr "PriontАil"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Post an sceАl seo"
+#~ msgid "C_lear"
+#~ msgstr "_FillteАn"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "_OscАil"
-
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
-
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#~ msgid "C_ut"
+#~ msgstr "Gearr"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr ""
+#~ msgid "Copy"
+#~ msgstr "Greamaigh"
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr ""
-
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr ""
-
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
-
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
-
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr ""
-
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr ""
-
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
-
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
-
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
-
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#~ msgid "Cut"
+#~ msgstr "Gearr"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr ""
-
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:21
 #, fuzzy
-msgid "_About Evolution..."
-msgstr "Evolution"
+#~ msgid "Redo"
+#~ msgstr "ScrМos"
 
-#: ui/evolution.xml.h:22
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
-
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr ""
+#~ msgid "Replace"
+#~ msgstr "Freagrair"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_FillteАn"
+#~ msgid "Undo"
+#~ msgstr "LeasЗ"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "_FillteАn"
-
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr ""
+#~ msgid "_Copy"
+#~ msgstr "Greamaigh"
 
-#: ui/evolution.xml.h:30
 #, fuzzy
-msgid "_Mail message (FIXME)"
-msgstr "_Post sceАl"
-
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr ""
+#~ msgid "_Print"
+#~ msgstr "PriontАil"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Undo"
+#~ msgstr "LeasЗ"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "F_older"
+#~ msgstr "_FillteАn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "ScrМos an sceal seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "ScrМos an sceal seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
+#, fuzzy
+#~ msgid "Move"
+#~ msgstr "ScrМos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-msgid "_Options"
-msgstr "_OscАil"
+#~ msgid "Show _All messages"
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+#~ msgid "_Edit Message"
+#~ msgstr "_Post sceАl"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#, fuzzy
+#~ msgid "_Forward"
+#~ msgstr "Sheoladh Chuig duine"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "_Post sceАl"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
+#, fuzzy
+#~ msgid "_Move to Folder..."
+#~ msgstr "SАbhАil 'san _fillteАn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "_Post sceАl"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "ScrМos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "SАbhАil 'san _fillteАn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#~ msgid "Send"
+#~ msgstr "Post"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr ""
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Post an sceАl seo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Post an sceАl seo"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Post an sceАl seo"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "_OscАil"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr ""
+#, fuzzy
+#~ msgid "_About Evolution..."
+#~ msgstr "Evolution"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr ""
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#~ msgid "_Folder"
+#~ msgstr "_FillteАn"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#, fuzzy
+#~ msgid "_Go to Folder..."
+#~ msgstr "_FillteАn"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr ""
+#, fuzzy
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_Post sceАl"
 
 #, fuzzy
 #~ msgid "Appointments:"
diff --git a/po/gl.po b/po/gl.po
index 51e01dc792..0f0b916bc1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,11 +7,11 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -19,11 +19,183 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Re-enviar esta mensaxe"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Recibindo correo de %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Pechar"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mover para a Carpeta"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ir С elemento anterior"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ir С elemento seguinte"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configurar Carpeta"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Sen erro"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Non foi posible conectarse С servidor POP en %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Novo"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Crear un novo contacto"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -31,7 +203,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -39,25 +211,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +237,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +245,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +253,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +261,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +275,7 @@ msgstr ""
 "\n"
 "  RЗa:         "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +283,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +291,7 @@ msgstr ""
 "\n"
 "  RexiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +299,7 @@ msgstr ""
 "\n"
 "  CСdigo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -135,13 +307,13 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -149,7 +321,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -157,7 +329,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -165,7 +337,7 @@ msgstr ""
 "\n"
 "Correo ElectrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -173,13 +345,13 @@ msgstr ""
 "\n"
 "Correo ElectrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -187,25 +359,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -213,31 +385,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -245,7 +417,7 @@ msgstr ""
 "\n"
 "CategorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -263,13 +435,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -277,17 +449,6 @@ msgstr ""
 "\n"
 "Clave PЗblica: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Non foi posible 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.
@@ -409,40 +570,32 @@ msgstr ""
 "Ocorreu un erro С obter a lista de\n"
 "pilots do demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "©Borrar Contacto?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -452,7 +605,7 @@ msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -465,14 +618,7 @@ msgstr "Tipos de TelИfono"
 msgid "New phone type"
 msgstr "Novo tipo de telИfono"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Engadir"
 
@@ -530,7 +676,6 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
@@ -547,8 +692,6 @@ msgid "_Address..."
 msgstr "_Enderezo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Xeral"
 
@@ -593,24 +736,27 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Traballo"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Traballo 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
@@ -619,6 +765,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "AutomСbil"
 
@@ -628,28 +775,33 @@ msgstr "CompaЯМa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax Particular"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "RDSI"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "MСbil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Outro"
 
@@ -658,10 +810,12 @@ msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr ""
 
@@ -678,62 +832,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "Correo ElectrСnico 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "Correo ElectrСnico 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Enderezo _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "CanadА"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "_PaМs:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finlandia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "Estados Unidos"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Enderezo:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Cidade:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Apdo. de Correos:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "CСdigo _Postal:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -803,12 +911,7 @@ msgstr "_Sufixo:"
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como unha _TАboa"
 
@@ -833,31 +936,31 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo contИn"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 #, fuzzy
 msgid "Name contains"
 msgstr "contИn"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "contИn"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosarА o navegador de carpetas"
 
@@ -886,9 +989,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -924,12 +1027,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
@@ -949,12 +1050,10 @@ msgid "Search Scope:"
 msgstr "Buscar"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaciСn:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "CamiЯo:"
 
@@ -980,193 +1079,90 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Nome:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "DescriciСn:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Engadir Fonte"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Eliminar"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Editar"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Gardar como VCard"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Buscar..."
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "Correo ElectrСnico 2"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "OrganizaciСn"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "Select name from:"
-msgstr "Seleccionar un nome da 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+msgid "Department"
+msgstr "_Departamento:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Oficina:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Tratamento:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_ProfesiСn:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Localizador (Pager)"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Sobrenome:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_CСnxuxe:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "No_tas:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gardar como VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1180,179 +1176,6 @@ msgstr ""
 "\n"
 "Faga dobre clic aquМ para crear un novo Contacto."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 ptos. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 ptos. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Corpo"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Inferior:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "DimensiСns:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Fonte..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Fontes"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Formato"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Cabeceiras"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Altura:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Horizontal"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Esquerda:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Pestanas coas letras no lateral"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marxes"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "NЗmero de columnas:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "OpciСns"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "OrientaciСn"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "PАxina"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "ConfiguraciСn da PАxina:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papel"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Orixe do papel:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Vertical"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "PrevisualizaciСn:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Imprimir usando sombreado gris"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Invertir nas pАxinas pares"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Dereita:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "SecciСns:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Sombreado"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "TamaЯo:"
-
-#: addressbook/printing/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:43
-msgid "Style name:"
-msgstr "Nome do estilo:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Superior:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Tipo:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Largura:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conducto de Axenda de Evolution"
@@ -1361,13 +1184,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1379,72 +1202,17 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Axenda"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conducto de Axenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Utilidade de configuraciСn para o conducto de axenda de evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Adiar"
 
@@ -1454,25 +1222,25 @@ msgstr "Adiar"
 msgid "Ok"
 msgstr "Aceptar"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1480,60 +1248,57 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "DescoЯecido"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1545,7 +1310,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1553,27 +1318,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1583,860 +1348,423 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Visualizar"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "anexo"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosarА a axenda"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Pechar"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Editar cita"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Alarmas Sonoras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Axenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Cores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Final do dМa:"
-
-#: calendar/gui/dialogs/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:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "Venres"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Luns"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "SАb"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "SАbado"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Amosar nЗmeros de semana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Inicio do dМa:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Xoves"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Formato da hora:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Martes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "MИr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "MИrcores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "segundos."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "©EstА seguro de que quere\n"
 "borrar este contacto?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
+msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "C_lasificaciСn:"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
+msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Cancelada"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Completada"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Baixa"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Non Iniciada"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "_Resume"
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "categorМas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Data de _Inicio:"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "ClasificaciСn"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Completada"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Hora de _finalizaciСn:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Contactos..."
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Prioridade:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_Estado:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "diАlogo-editor-tarefas"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
-msgstr "Sen resume"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioridade"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "_Resume"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Transparente"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Abrir a tarefa"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Eliminar"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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 "%d de %b"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Evento de dМa _completo"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "ClasificaciСn"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "DМas"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "ExcepciСns"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Horas"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "Enviar _a:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Preview"
-msgstr "PrevisualizaciСn:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "Pri_vado"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "PЗ_blico"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
+msgid "Category:"
 msgstr ""
+"\n"
+"CategorМas: "
 
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr "_Resume:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Hora"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_Audio"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_Visualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "Hora de _finalizaciСn:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_Correo"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Programa"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "_Executar programa:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Data de _comezo:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dМa(s)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "diАlogo-editor-eventos"
+#. 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:338
+msgid "%d %B"
+msgstr "%d de %b"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Editar Cita"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dМa"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "mes(es)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Luns"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Martes"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "semana(s)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "MИrcores"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "ano(s)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Xoves"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "Editar Cita"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Venres"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr ""
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "SАbado"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dМa"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Domingo"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Non foi posible cargar a axenda en `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Non foi posible crear un calendario en `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Non И posible abrir a carpeta `%s':\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "abril"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "agosto"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "decembro"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "febreiro"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Ir А data"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "xaneiro"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "xullo"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "xuЯo"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "marzo"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Luns"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "MИr"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "novembro"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Xov"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "outubro"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "setembro"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "SАb"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar Bonobo"
@@ -2630,10 +1958,15 @@ msgstr "Ano actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Previsualizar da ImpresiСn"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "O URI que amosarА a axenda"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
@@ -2724,61 +2057,69 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Cancelada"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(mАquina descoЯecida)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Abrir axenda"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de mАquina"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiЯo"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, 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:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2787,17 +2128,17 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "O URL `%s' non contИn ningЗn protocolo"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "O URL `%s' contИn un protocolo non vАlido"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "O nЗmero de porto no URL `%s' non И numИrico"
@@ -2814,40 +2155,41 @@ msgstr "Non foi posible crear unha canalizaciСn: %s"
 msgid "Bad authentication response from server."
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erro descoЯecido"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2859,27 +2201,27 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando autenticaciСn Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2890,21 +2232,22 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr ""
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "`%s' non И un directorio."
 
 #: 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2912,7 +2255,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3254,8 +2597,8 @@ msgid ""
 msgstr ""
 "Esta opciСn autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
@@ -3287,7 +2630,7 @@ msgstr ""
 "recibir correo de certos provedores de correo web, e de sistemas de email "
 "propietarios."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3295,7 +2638,7 @@ msgstr ""
 "Esta opciСn conectarase С servidor POP usando un contrasinal sen cifrar. "
 "Esta И a Зnica opciСn que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3305,28 +2648,28 @@ msgstr ""
 "travИs do protocolo APOP. Pode que isto non funcione para tСdolos usuarios, "
 "mesmo naqueles que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Isto conectarase С servidor POP e usarА Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co 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 "Non foi posible conectarse С servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3335,12 +2678,12 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(DescoЯecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3348,7 +2691,7 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Non se soporta o mecanismo de autenticaciСn solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3357,13 +2700,12 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3414,26 +2756,21 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a travИs do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr "SMTP"
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "AutenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3442,110 +2779,109 @@ msgstr ""
 "Esta opciСn conectarase С servidor POP usando un contrasinal sen cifrar. "
 "Esta И a Зnica opciСn que soportan moitos servidores POP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando autenticaciСn Kerberos 4."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo a travИs do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalizaciСn para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "o sendmail saМu co sinal %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Erro descoЯecido: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3588,12 +2924,11 @@ msgid "attachment"
 msgstr "anexo"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "IncluМr un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Quitar"
 
@@ -3609,56 +2944,40 @@ msgstr "Engadir anexo..."
 msgid "Attach a file to the message"
 msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Propiedades do anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nome de ficheiro:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Prema aquМ para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3666,11 +2985,11 @@ msgstr ""
 "Introduza os enderezos que recibirАn unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
@@ -3683,38 +3002,38 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Gardando as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Gardar as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3724,27 +3043,27 @@ msgstr ""
 "\n"
 "©Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Non И un ficheiro normal."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3752,27 +3071,22 @@ msgstr ""
 "O ficheiro И moi longo (mАis de 100K).\n"
 "©EstА seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "CompoЯer unha mensaxe"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 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 "year"
 msgstr "ano"
@@ -3900,7 +3214,7 @@ msgstr ""
 "Entrante\n"
 "SaМnte\n"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
@@ -4001,195 +3315,170 @@ msgstr ""
 msgid "Read"
 msgstr "Refacer"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Reglas de Filtrado"
-
-#: filter/filter.glade.h:12
-#, fuzzy
-msgid "Incoming"
-msgstr ""
-"Entrante\n"
-"SaМnte\n"
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr ""
-"Entrante\n"
-"SaМnte\n"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Carpetas Virtuais"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr ""
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar PuntuaciСn"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "contИn"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Copiar А Carpeta"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data de recepciСn"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data de envМo"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "ExpresiСn"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Reenviar С Enderezo"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "non contИn"
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "non termina en"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "non existe"
+msgid "Message was sent"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "non empeza por"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "termina en"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "existe"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "PuntuaciСn"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "ExpresiСn"
+msgid "Sender"
+msgstr "Autor"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Reenviar С Enderezo"
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "И"
+msgid "Source"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "И maior que"
+msgid "Specific header"
+msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "И menor que"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "non И"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Asunto"
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
+msgid "after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr ""
+msgid "contains"
+msgstr "contИn"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
+msgid "does not contain"
+msgstr "non contИn"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr ""
+msgid "does not end with"
+msgstr "non termina en"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "does not start with"
+msgstr "non empeza por"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Autor"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
+msgid "is greater than"
+msgstr "И maior que"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "И menor que"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr ""
+msgid "is not"
+msgstr "non И"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr ""
+msgid "is"
+msgstr "И"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Asunto"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4207,10 +3496,6 @@ msgstr "Engadir Regra"
 msgid "Edit Score Rule"
 msgstr ""
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "PuntuaciСn"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr ""
@@ -4219,221 +3504,171 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Gardar"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Seleccionar Carpeta"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "O corpo ou o asunto conteЯen"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "O corpo contИn"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "O asunto contИn"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "O corpo non contИn"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "O asunto non contИn"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Ver Todos"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Agochar"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Eliminar"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Asunto"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Responder С Autor"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Editar"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Responder С Autor"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar А Carpeta"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Editar Mensaxe"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "O asunto И %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Non foi posible iniciar wombat"
-
-#: mail/local-config.glade.h:7
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "Formato"
+msgid " (default)"
+msgstr "Eliminar"
 
-#: mail/local-config.glade.h:8
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
 #, fuzzy
-msgid "New store format:"
-msgstr "Tipo de fonte de Novas:"
+msgid "Evolution Account Manager"
+msgstr "XestiСn e Contas"
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
-
-#: mail/local-config.glade.h:10
-msgid "maildir"
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "InstalaciСn de Evolution"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4455,7 +3690,7 @@ msgstr "Enviar dende %s"
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4463,7 +3698,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4471,25 +3706,21 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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 "Non ten ningunha fonte de correo configurada"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ningЗn mИtodo de envМo de correo"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4497,24 +3728,31 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "©Enviar realmente?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Ten que configurar unha identidade\n"
+"antes de poder escribir correo."
+
+#: mail/mail-callbacks.c:365
 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:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4522,11 +3760,11 @@ msgstr ""
 "SС pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "©Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4534,17 +3772,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "©Sobrescribilo?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4553,450 +3791,33 @@ msgstr ""
 "Erro cargando a informaciСn do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "A impresiСn da mensaxe fallou"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-#, fuzzy
-msgid "Account"
-msgstr "Contas"
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr "InformaciСn de Contas"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr "XestiСn e Contas"
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Propiedades do anexo"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Authentication"
-msgstr "AutenticaciСn"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "AutenticaciСn:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-#, fuzzy
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Noraboa, a configuraciСn do correo estА completa."
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Eliminar"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Non borrar as mensaxes do servidor"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "mes"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "Enderezo de Email:"
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Email Address:"
-msgstr "Enderezo de Email:"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraciСn de Correo do Evolution"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Full Name:"
-msgstr "Nome Completo:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Identidade"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "Contas"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "ConfiguraciСn do Correo"
-
-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr "Axudante da ConfiguraciСn do Correo"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-msgid "News"
-msgstr "Novas"
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Optional"
-msgstr "Opcional"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganizaciСn:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Responder-A:"
-
-#: mail/mail-config-druid.glade.h:57
-msgid "Reply-to:"
-msgstr "Responder-a:"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "Persoas _Requiridas"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Gardar como VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Enviando Correo"
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Server Configuration"
-msgstr "ConfiguraciСn do Servidor"
-
-#: mail/mail-config-druid.glade.h:65
-#, fuzzy
-msgid "Server Timeouts"
-msgstr "Tipo de Servidor: "
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Server Type: "
-msgstr "Tipo de Servidor: "
-
-#: mail/mail-config-druid.glade.h:67
-#, fuzzy
-msgid "Server requires authentication"
-msgstr "O servidor SMTP require autenticaciСn"
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Servidor:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config-druid.glade.h:72
-#, fuzzy
-msgid "This server requires a secure connection (SSL)"
-msgstr "O servidor SMTP require autenticaciСn"
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Tipo:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Sen InformaciСn"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config-druid.glade.h:78
-#, fuzzy
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minutos"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"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:446
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "Enderezo de email:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Ficheiro de Sinatura"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Servidor:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Detectar tipos soportados..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Non borrar as mensaxes do servidor"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Probar ConfiguraciСn"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Tipo de fonte de correo:"
-
-#: mail/mail-config-gui.c:1135
-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:1154
-msgid "News source type:"
-msgstr "Tipo de fonte de Novas:"
-
-#: 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:1178
-msgid "Mail transport type:"
-msgstr "Tipo de transporte de correo:"
-
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Engadir Identidade"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Editar Identidade"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Engadir Fonte"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Editar Fonte"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Engadir Servidor de News"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Editar Servidor de News"
-
-#: mail/mail-config-gui.c:2253
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Testing \"%s\""
-msgstr "Probando \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "║A conexiСn foi correcta!"
-
-#: mail/mail-config-gui.c:2346
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Querying authorization capabilities of \"%s\""
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Enderezo"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "Identidades"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Fontes de Correo"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte do Correo"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Marcar mensaxe como lida [ms]: "
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Servidores de News"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Fontes de Novas"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "OrganizaciСn"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Enviar mensaxes en formato HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalizaciСn co GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "O programa GPG/PGP non estА dispoЯible."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Non foi posible crear unha canalizaciСn: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5033,65 +3854,65 @@ msgstr "Abrir en %s..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Non hai soporte de GPG/PGP dispoЯible nesta copia do Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Responder-A:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5150,7 +3971,7 @@ msgstr "Creando unha nova carpeta"
 msgid "Register local folder"
 msgstr "Crear unha nova carpeta"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5182,160 +4003,160 @@ msgstr ""
 msgid "Working"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recibindo correo de %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recibir correo de %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non hai novo correo en %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Sen descriciСn)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5346,7 +4167,7 @@ msgstr "Erro gardando o ficheiro: %s"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5450,116 +4271,195 @@ msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Responder С autor desta mensaxe"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tСdolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "DescoЯecido"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "anexo"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Pegar"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Data de recepciСn"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "A:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "TamaЯo:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "O programa GPG/PGP non estА dispoЯible."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Non se indicou un contrasinal."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalizaciСn co GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Non foi posible crear unha canalizaciСn: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Carpetas"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "PuntuaciСn"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
@@ -5669,23 +4569,24 @@ msgstr ""
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sen_tМtulo)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5695,7 +4596,7 @@ msgstr ""
 "en grupo para xestiСn de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Ir А carpeta..."
 
@@ -5703,13 +4604,18 @@ msgstr "Ir А carpeta..."
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5717,7 +4623,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5726,15 +4632,15 @@ msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compoЯente %s se estragou."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5743,51 +4649,61 @@ msgstr ""
 "©Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Amosar a Barra de _Atallos"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Amosar a Barra de _Atallos"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activar este atallo"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
@@ -5795,12 +4711,11 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
@@ -5894,1273 +4809,1775 @@ msgstr "Desactivar."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoЯentes de Bonobo"
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Crear un novo contacto"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Nova Cita"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Solicitude de _Tarefa"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contacto"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Novo"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Tarefa"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Imprimir contactos"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Solicitude de _Tarefa"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Parar"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Entrada de _Xornal"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Parar a Carga"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Nota"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Ver Todos"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Es_colla un Formulario..."
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Ver tСdolos contactos"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "ConfiguraciСn do _Correo..."
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Definir E_stilos de ImpresiСn"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Imprimir Contactos..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: _Enviar"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Buscar contactos"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Gardar Ane_xos..."
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: _Mover para a Carpeta..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 DМas"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Cop_iar А Carpeta..."
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr ""
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "ConfiguraciСn da PАxina:"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Pre_visualizaciСn da ImpresiСn"
+
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Axenda"
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Pegar _Especial..."
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Preferencias da Axenda..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Marcar como _non Lida"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Crear unha nova cita"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Obxecto"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: _Elemento"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "DМa"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Elemento _non Lido"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Ir para atrАs no tempo"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Ir para diante no tempo"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Ir para"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _EstАndar"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Ir para a data especificada"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Fo_rmato"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr ""
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Personalizar..."
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mes"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "An_terior"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Seguinte"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Abrir unha axenda"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Barras de ferramentas"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr ""
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _Ficheiro..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: _Elemento..."
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Imprimir esta axenda"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Obxecto..."
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Fonte..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _ParАgrafo..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: DeseЯar este _Formulario"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Amosar un dМa"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: _DeseЯar un Formulario..."
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Amosar un mes"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publicar _Formulario..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Amosar unha semana"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Amosar a semana laboral"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: _Depurador de Script"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoxe"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _OrtografМa..."
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Semana"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formularios"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Novo"
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "FIXME: _Contacto"
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Abrir axenda"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Imprimir esta axenda"
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: _Contacto"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml:146
 #, fuzzy
-msgid "_Save As..."
-msgstr "Gardar _Como..."
+msgid "FIXME: New _Message to Contact"
+msgstr "Enviar unha mensaxe sen asunto"
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Borrar este elemento"
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: _Contacto"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "Delete..."
-msgstr "Eliminar"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _OrtografМa..."
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Axuda"
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: _Contacto"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml:150
 #, fuzzy
-msgid "Print En_velope..."
-msgstr "_ConfiguraciСn da ImpresiСn..."
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: Entrada de _Xornal"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Imprimir este elemento"
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: Cop_iar А Carpeta..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Imprimir..."
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Gardar _Como..."
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Gardar e Pechar"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Reenviar como v_Calendar"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Gardar o contacto e pechar a caixa de diАlogo"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Reenviar"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "_Formatar"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Ver a axuda online"
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "AcciС_ns"
 
-#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml:246
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "Enviar unha mensaxe sen asunto"
+msgid "FIXME: Previous"
+msgstr "Anterior"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Ficheiro"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Ir С elemento anterior"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml:249
 #, fuzzy
-msgid "_Print..."
-msgstr "Imprimir..."
+msgid "FIXME: Next"
+msgstr "FIXME: _Nota"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Gardar"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Ir С elemento seguinte"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "Acerca desta aplicaciСn"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Acerca de..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "AcciС_ns"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupado"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "_Limpar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "FСra da Oficina"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "Co_rtar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Sen InformaciСn"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Limpar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Limpar a selecciСn"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_OpciСns"
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Amosar _SС as Horas de Traballo"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copiar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Copiar a selecciСn"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Cortar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Cortar a selecciСn"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descriciСn Xml da Interface"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_TСdalas Persoas e Recursos"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Libro de enderezos..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "TСdalas _Persoas e Un Recurso"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Es_colla un Formulario..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Persoas _Requiridas"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Veri_ficar Nomes"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Persoas Requiridas e _Un Recurso"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_iar А Carpeta..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora do _inicio da reuniСn:"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _DeseЯar un Formulario..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora do _final da reuniСn:"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Definir E_stilos de ImpresiСn"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: DeseЯar este _Formulario"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pri_meiro elemento na Carpeta"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B de %Y"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Reenviar"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Reenviar como v_Calendar"
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Agora"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Axuda"
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Hoxe"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Tarefa in_completa"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Inserir Ficheiro"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: _Elemento..."
+#: widgets/misc/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Buscar"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Pegar _Especial..."
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grupo %i"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualizaciСn da ImpresiСn"
+#~ msgid "Delete Contact?"
+#~ msgstr "©Borrar Contacto?"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar Formulario Como..."
+#~ msgid "Address _2:"
+#~ msgstr "Enderezo _2:"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _Formulario..."
+#~ msgid "Canada"
+#~ msgstr "CanadА"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr ""
+#~ msgid "Countr_y:"
+#~ msgstr "_PaМs:"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: _Enviar"
+#~ msgid "Finland"
+#~ msgstr "Finlandia"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Gardar Ane_xos..."
+#~ msgid "USA"
+#~ msgstr "Estados Unidos"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de Script"
+#~ msgid "_Address:"
+#~ msgstr "_Enderezo:"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Solicitude de _Tarefa"
+#~ msgid "_City:"
+#~ msgstr "_Cidade:"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacto"
+#~ msgid "_PO Box:"
+#~ msgstr "_Apdo. de Correos:"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
+#~ msgid "_State/Province:"
+#~ msgstr "E_stado/Provincia:"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Ficheiro..."
+#~ msgid "_ZIP Code:"
+#~ msgstr "CСdigo _Postal:"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "Engadir Fonte"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: Fo_rmato"
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elemento"
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "Seleccionar un nome da Lista:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada de _Xornal"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Derradeiro Elemento na Carpeta"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Enviar _Mensaxe"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para a Carpeta..."
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nova Cita"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Obxecto..."
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _ParАgrafo..."
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _OrtografМa..."
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: _EstАndar"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Elemento _non Lido"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "m"
+#~ msgstr "m"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "_Formatar"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Buscar Novamente"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Buscar _Novamente"
+#~ msgid "p"
+#~ msgstr "p"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Ir С elemento seguinte"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Ir С elemento anterior"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Modificar as propiedades do ficheiro"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "Se_guinte"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Pegar"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do cartafol"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "An_terior"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Anterior"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "_ConfiguraciСn da ImpresiСn..."
+#~ msgid "y"
+#~ msgstr "y"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "ConfiguraciСn da ImpresiСn"
+#~ msgid "z"
+#~ msgstr "z"
 
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Propiedades"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 ptos. Tahoma"
 
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Refacer"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 ptos. Tahoma"
+
+#~ msgid "Body"
+#~ msgstr "Corpo"
+
+#~ msgid "Bottom:"
+#~ msgstr "Inferior:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "DimensiСns:"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Refacer a acciСn desfeita"
+#~ msgid "Font..."
+#~ msgstr "Fonte..."
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "SubstituМr"
+#~ msgid "Fonts"
+#~ msgstr "Fontes"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "SubstituМr unha cadea"
+#~ msgid "Format"
+#~ msgstr "Formato"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de diАlogo"
+#~ msgid "Headings"
+#~ msgstr "Cabeceiras"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Gardar o ficheiro actual"
+#~ msgid "Height:"
+#~ msgstr "Altura:"
+
+#~ msgid "Landscape"
+#~ msgstr "Horizontal"
+
+#~ msgid "Left:"
+#~ msgstr "Esquerda:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Pestanas coas letras no lateral"
+
+#~ msgid "Margins"
+#~ msgstr "Marxes"
+
+#~ msgid "Number of columns:"
+#~ msgstr "NЗmero de columnas:"
+
+#~ msgid "Options"
+#~ msgstr "OpciСns"
+
+#~ msgid "Orientation"
+#~ msgstr "OrientaciСn"
+
+#~ msgid "Page"
+#~ msgstr "PАxina"
+
+#~ msgid "Paper"
+#~ msgstr "Papel"
+
+#~ msgid "Paper source:"
+#~ msgstr "Orixe do papel:"
+
+#~ msgid "Portrait"
+#~ msgstr "Vertical"
+
+#~ msgid "Preview:"
+#~ msgstr "PrevisualizaciСn:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Imprimir usando sombreado gris"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Invertir nas pАxinas pares"
+
+#~ msgid "Right:"
+#~ msgstr "Dereita:"
+
+#~ msgid "Sections:"
+#~ msgstr "SecciСns:"
+
+#~ msgid "Shading"
+#~ msgstr "Sombreado"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Iniciar nunha nova pАxina"
+
+#~ msgid "Style name:"
+#~ msgstr "Nome do estilo:"
+
+#~ msgid "Top:"
+#~ msgstr "Superior:"
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Width:"
+#~ msgstr "Largura:"
+
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
-msgid "Schedule Meeting"
-msgstr "FIXME: Programar ReuniСn"
+#~ msgid "Calendar Server"
+#~ msgstr "Axenda"
 
-#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "FIXME: _Programar ReuniСn"
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Conducto de Axenda de Evolution"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr ""
+#~ "Utilidade de configuraciСn para o conducto de axenda de evolution.\n"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
+#~ msgid "Edit appointment"
+#~ msgstr "Editar cita"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Buscar unha cadea"
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Tempo de adiamento (minutos)"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr ""
+#~ msgid "05 minutes"
+#~ msgstr "05 minutos"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutos"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar as opciСns de pАxina para a impresora actual"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 horas (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Desfacer"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutos"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Desfacer a Зltima acciСn"
+#~ msgid "24 hour"
+#~ msgstr "24 horas"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_Acerca de..."
+#~ msgid "30 minutes"
+#~ msgstr "30 minutos"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Pechar"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutos"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Copiar"
+#~ msgid "Audio Alarms"
+#~ msgstr "Alarmas Sonoras"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr "_DepuraciСn"
+#~ msgid "Calendar"
+#~ msgstr "Axenda"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Editar"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias da Axenda"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Buscar..."
+#~ msgid "Colors"
+#~ msgstr "Cores"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formularios"
+#~ msgid "End of day:"
+#~ msgstr "Final do dМa:"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "A_xuda"
+#~ msgid "First day of week:"
+#~ msgstr "Primeiro dМa da semana:"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Inserir"
+#~ msgid "Show week numbers"
+#~ msgstr "Amosar nЗmeros de semana"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Obxecto"
+#~ msgid "Start of day:"
+#~ msgstr "Inicio do dМa:"
 
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Pegar"
+#~ msgid "Time format:"
+#~ msgstr "Formato da hora:"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Imprimir"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#~ msgid "seconds."
+#~ msgstr "segundos."
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "_Refacer"
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leta:"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_SubstituМr..."
+#~ msgid "C_lassification:"
+#~ msgstr "C_lasificaciСn:"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
+#~ msgid "High"
+#~ msgstr "Alta"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Desfacer"
+#~ msgid "In Progress"
+#~ msgstr "En Progreso"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Redactar"
+#~ msgid "Low"
+#~ msgstr "Baixa"
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Redactar unha nova mensaxe"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe nunha nova carpeta"
+#~ msgid "Not Started"
+#~ msgstr "Non Iniciada"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Carpeta"
+#~ msgid "Task"
+#~ msgstr "Tarefa"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#~ msgid "_Contacts..."
+#~ msgstr "_Contactos..."
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#~ msgid "_Priority:"
+#~ msgstr "_Prioridade:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Estado:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "diАlogo-editor-tarefas"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Evento de dМa _completo"
+
+#~ msgid "Days"
+#~ msgstr "DМas"
+
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgid "Exceptions"
+#~ msgstr "ExcepciСns"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Enviar _a:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "PrevisualizaciСn:"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vado"
+
+#~ msgid "Pu_blic"
+#~ msgstr "PЗ_blico"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "_Resume:"
+
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidencial"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correo"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "_Run program:"
+#~ msgstr "_Executar programa:"
+
+#~ msgid "_Start time:"
+#~ msgstr "Hora de _comezo:"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Esquecer _Contrasinais"
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _comezo:"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Recibir Correo"
+#~ msgid "day(s)"
+#~ msgstr "dМa(s)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "diАlogo-editor-eventos"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "mes(es)"
+
+#~ msgid "week(s)"
+#~ msgstr "semana(s)"
+
+#~ msgid "year(s)"
+#~ msgstr "ano(s)"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Non foi posible crear un calendario en `%s'"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Borrar Mensaxe"
+#~ msgid "April"
+#~ msgstr "abril"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Mensaxe reenviada - %s"
+#~ msgid "August"
+#~ msgstr "agosto"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Imprimir a mensaxe seleccionada"
+#~ msgid "December"
+#~ msgstr "decembro"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "_Filtros de Correo..."
+#~ msgid "February"
+#~ msgstr "febreiro"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "DescriciСn:"
+#~ msgid "Go To Date"
+#~ msgstr "Ir А data"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "Marcar como _Lida"
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Ir a hoxe"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Marcar como _non Lida"
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "xaneiro"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Mover"
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "xullo"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a unha nova carpeta"
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "xuЯo"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Previsualiza a mensaxe que se vai imprimir"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "marzo"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Luns"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "novembro"
+
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "outubro"
+
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "setembro"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Responder a _Todos"
+#~ msgid "Attachment properties"
+#~ msgstr "Propiedades do anexo"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Responder С _Autor"
+#~ msgid "File name:"
+#~ msgstr "Nome de ficheiro:"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Seleccionar _Todo"
+#~ msgid "MIME type:"
+#~ msgstr "Tipo MIME:"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#~ msgid "Filter Rules"
+#~ msgstr "Reglas de Filtrado"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Ver Todos"
+#~ msgid "Incoming"
+#~ msgstr ""
+#~ "Entrante\n"
+#~ "SaМnte\n"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
+#, fuzzy
+#~ msgid "Outgoing"
+#~ msgstr ""
+#~ "Entrante\n"
+#~ "SaМnte\n"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#~ msgid "Virtual Folders"
+#~ msgstr "Carpetas Virtuais"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#~ msgid "Save"
+#~ msgstr "Gardar"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Ver Todos"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Aplicar Filtros"
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "Agochar"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Configurar Carpeta"
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Eliminar"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copiar А Carpeta"
+#~ msgid "Hide Subject"
+#~ msgstr "Asunto"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Editar Mensaxe"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Responder С Autor"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Editar Mensaxe"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "O asunto И %s"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Reenviar"
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Non foi posible iniciar wombat"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Inverter SelecciСn"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "Formato"
+
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Tipo de fonte de Novas:"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "ConfiguraciСn do _Correo..."
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Mensaxe"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Non ten ningunha fonte de correo configurada"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Mover para a Carpeta"
+#~ msgid "Account"
+#~ msgstr "Contas"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Abrir nunha Nova Fiestra"
+#~ msgid "Account Information"
+#~ msgstr "InformaciСn de Contas"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Imprimir Mensaxe"
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Propiedades do anexo"
+
+#~ msgid "Authentication"
+#~ msgstr "AutenticaciСn"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Gardar como..."
+#~ msgid "Authentication Type:"
+#~ msgstr "AutenticaciСn:"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Fontes"
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Noraboa, a configuraciСn do correo estА completa."
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "Non borrar as mensaxes do servidor"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "_Borrar"
+#~ msgid "Done"
+#~ msgstr "mes"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "Enderezo de Email:"
+
+#~ msgid "Email Address:"
+#~ msgstr "Enderezo de Email:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraciСn de Correo do Evolution"
+
+#~ msgid "Full Name:"
+#~ msgstr "Nome Completo:"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Carpetas Virtuais"
+#~ msgid "Hostname:"
+#~ msgstr "Nome de usuario:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Identity"
+#~ msgstr "Identidade"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Attach"
-msgstr "IncluМr un ficheiro"
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "Mail"
+#~ msgstr "Correo"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "Gardar o ficheiro actual"
+#~ msgid "Mail Account"
+#~ msgstr "Contas"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraciСn do Correo"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Axudante da ConfiguraciСn do Correo"
+
+#~ msgid "News"
+#~ msgstr "Novas"
+
+#~ msgid "Optional"
+#~ msgstr "Opcional"
+
+#~ msgid "Organization:"
+#~ msgstr "OrganizaciСn:"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Responder-a:"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Mensaxe cifrada"
+#~ msgid "Required"
+#~ msgstr "Persoas _Requiridas"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Gardar como VCard"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "IncluМr un ficheiro como anexo na mensaxe"
+#~ msgid "Select signature file"
+#~ msgstr "Ficheiro de sinatura:"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "Enviando Correo"
+
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraciСn do Servidor"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Abrir ficheiro"
+#~ msgid "Server Timeouts"
+#~ msgstr "Tipo de Servidor: "
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#~ msgid "Server Type: "
+#~ msgstr "Tipo de Servidor: "
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "Server requires authentication"
+#~ msgstr "O servidor SMTP require autenticaciСn"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "Gardar _Como"
+#~ msgid "Servers"
+#~ msgstr "Servidor:"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
+#~ msgid "Signature file:"
+#~ msgstr "Ficheiro de sinatura:"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Ir А carpeta..."
+#~ msgid "Signature:"
+#~ msgstr "Ficheiro de sinatura:"
+
+#~ msgid "Sources"
+#~ msgstr "Fontes"
 
-#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-msgid "Save the current file with a different name"
-msgstr "Gardar o ficheiro actual"
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "O servidor SMTP require autenticaciСn"
 
-#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Save the message in a specified folder"
-msgstr "Mover mensaxe a unha nova carpeta"
+#~ msgid "Type"
+#~ msgstr "Tipo:"
 
-#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-msgid "Send"
-msgstr "Autor"
+#~ msgid "User Information"
+#~ msgstr "Sen InformaciСn"
+
+#~ msgid "Username:"
+#~ msgstr "Nome de usuario:"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "Autor"
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "Autor"
+#~ msgid "minute(s)"
+#~ msgstr "minutos"
+
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
+
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de email:"
+
+#~ msgid "Signature File"
+#~ msgstr "Ficheiro de Sinatura"
+
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Detectar tipos soportados..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Non borrar as mensaxes do servidor"
+
+#~ msgid "Test Settings"
+#~ msgstr "Probar ConfiguraciСn"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Tipo de fonte de correo:"
+
+#~ msgid "News source type:"
+#~ msgstr "Tipo de fonte de Novas:"
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Tipo de transporte de correo:"
+
+#~ msgid "Add Identity"
+#~ msgstr "Engadir Identidade"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Editar Identidade"
+
+#~ msgid "Add Source"
+#~ msgstr "Engadir Fonte"
+
+#~ msgid "Edit Source"
+#~ msgstr "Editar Fonte"
+
+#~ msgid "Add News Server"
+#~ msgstr "Engadir Servidor de News"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Editar Servidor de News"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Probando \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "║A conexiСn foi correcta!"
+
+#~ msgid "Address"
+#~ msgstr "Enderezo"
+
+#~ msgid "Identities"
+#~ msgstr "Identidades"
+
+#~ msgid "Mail Sources"
+#~ msgstr "Fontes de Correo"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte do Correo"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Marcar mensaxe como lida [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "Servidores de News"
+
+#~ msgid "News Sources"
+#~ msgstr "Fontes de Novas"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Enviar mensaxes en formato HTML"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "Non hai soporte de GPG/PGP dispoЯible nesta copia do Evolution."
+
+#~ msgid "Delete a contact"
+#~ msgstr "Borrar un contacto"
+
+#~ msgid "Find"
+#~ msgstr "Buscar"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "Print contacts"
+#~ msgstr "Imprimir contactos"
+
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Parar a Carga"
+
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Ver tСdolos contactos"
 
-#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-msgid "Send the mail in HTML format"
-msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "ConfiguraciСn do _Correo..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimir Contactos..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Buscar contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 DМas"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Previsualiza a mensaxe que se vai imprimir"
+#~ msgid "Ca_lendar"
+#~ msgstr "Axenda"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Preferencias da Axenda..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Crear unha nova cita"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
+
+#~ msgid "Day"
+#~ msgstr "DМa"
+
+#~ msgid "Go back in time"
+#~ msgstr "Ir para atrАs no tempo"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Ir para diante no tempo"
+
+#~ msgid "Go to"
+#~ msgstr "Ir para"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Ir para a data especificada"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir unha axenda"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Imprimir esta axenda"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Amosar un dМa"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Amosar un mes"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Amosar unha semana"
+
+#~ msgid "Show the working week"
+#~ msgstr "Amosar a semana laboral"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_New"
+#~ msgstr "_Novo"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir axenda"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimir esta axenda"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "_Save As..."
+#~ msgstr "Gardar _Como..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Borrar este elemento"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Borrar esta mensaxe"
+#~ msgid "Delete..."
+#~ msgstr "Eliminar"
+
+#~ msgid "Help"
+#~ msgstr "Axuda"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Gardar Anexo"
+#~ msgid "Print En_velope..."
+#~ msgstr "_ConfiguraciСn da ImpresiСn..."
+
+#~ msgid "Print this item"
+#~ msgstr "Imprimir este elemento"
+
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Gardar _Como..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Gardar e Pechar"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Gardar o contacto e pechar a caixa de diАlogo"
+
+#~ msgid "See online help"
+#~ msgstr "Ver a axuda online"
+
+#~ msgid "_File"
+#~ msgstr "_Ficheiro"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "anexo"
+#~ msgid "_Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "_Save"
+#~ msgstr "_Gardar"
+
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicaciСn"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "C_ut"
+#~ msgstr "Co_rtar"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Limpar a selecciСn"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Pechar esta cita"
+
+#~ msgid "Copy"
+#~ msgstr "Copiar"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copiar a selecciСn"
+
+#~ msgid "Cut"
+#~ msgstr "Cortar"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Cortar a selecciСn"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descriciСn Xml da Interface"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: _Libro de enderezos..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Veri_ficar Nomes"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Axuda"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Tarefa in_completa"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Inserir Ficheiro"
+
+#~ msgid "Find Again"
+#~ msgstr "Buscar Novamente"
+
+#~ msgid "Find _Again"
+#~ msgstr "Buscar _Novamente"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Modificar as propiedades do ficheiro"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Pegar o contido do cartafol"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_ConfiguraciСn da ImpresiСn..."
+
+#~ msgid "Print Setup"
+#~ msgstr "ConfiguraciСn da ImpresiСn"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refacer a acciСn desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "SubstituМr"
+
+#~ msgid "Replace a string"
+#~ msgstr "SubstituМr unha cadea"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gardar a cita e pechar a caixa de diАlogo"
+
+#~ msgid "Save the current file"
+#~ msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "anexo"
+#~ msgid "Schedule Meeting"
+#~ msgstr "FIXME: Programar ReuniСn"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Enviando unha mensaxe sen asunto"
+#~ msgid "Schedule _Meeting"
+#~ msgstr "FIXME: _Programar ReuniСn"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Search for a string"
+#~ msgstr "Buscar unha cadea"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Configurar as opciСns de pАxina para a impresora actual"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a Зltima acciСn"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Close"
+#~ msgstr "_Pechar"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "_Debug"
+#~ msgstr "_DepuraciСn"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "_Find..."
+#~ msgstr "_Buscar..."
+
+#~ msgid "_Help"
+#~ msgstr "A_xuda"
+
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
+
+#~ msgid "_Print"
+#~ msgstr "_Imprimir"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propiedades..."
+
+#~ msgid "_Redo"
+#~ msgstr "_Refacer"
+
+#~ msgid "_Replace..."
+#~ msgstr "_SubstituМr..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Desfacer"
+
+#~ msgid "Compose"
+#~ msgstr "Redactar"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Redactar unha nova mensaxe"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar a mensaxe nunha nova carpeta"
+
+#~ msgid "F_older"
+#~ msgstr "_Carpeta"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Esquecer _Contrasinais"
+
+#~ msgid "Get Mail"
+#~ msgstr "Recibir Correo"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "Abrir..."
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Borrar Mensaxe"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "Mensaxe reenviada - %s"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "Engadir a carpeta А sЗa lista de carpetas subscritas"
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Imprimir a mensaxe seleccionada"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Actualizar Lista"
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtros de Correo..."
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Actualizar Lista de Carpetas"
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "DescriciСn:"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Eliminar a carpeta da sЗa lista de carpetas subscritas"
+#~ msgid "Mar_k As Read"
+#~ msgstr "Marcar como _Lida"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Subscribir"
+#~ msgid "Move"
+#~ msgstr "Mover"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Desubscribir"
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a unha nova carpeta"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Visualizar unha carpeta diferente"
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "_SaМr"
+#~ msgid "Print Preview of message..."
+#~ msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra do Evolution"
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "SaМr do programa"
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaxe..."
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "_IniciaciСn"
+#~ msgid "Reply to _All"
+#~ msgstr "Responder a _Todos"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Amosar informaciСn sobre o Evolution"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Responder С _Autor"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Amosar a Barra de _Carpetas"
+#~ msgid "Select _All"
+#~ msgstr "Seleccionar _Todo"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Amosar a Barra de _Atallos"
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:14
 #, fuzzy
-msgid "Submit _Bug Report"
-msgstr "_Enviar un Informe de Erro"
+#~ msgid "Show _All messages"
+#~ msgstr "Ver Todos"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplicar Filtros"
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "Enviar un informe de erro usando o Bug Buddy"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copiar А Carpeta"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
+#~ msgid "_Edit Message"
+#~ msgstr "_Editar Mensaxe"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#~ msgid "_Forward"
+#~ msgstr "_Reenviar"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "Uso do Xestor de Co_ntactos"
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverter SelecciСn"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Uso da _Axenda"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "ConfiguraciСn do _Correo..."
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Uso do Cliente de _Correo"
+#~ msgid "_Message"
+#~ msgstr "_Mensaxe"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Acerca do Evolution..."
+#, fuzzy
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Mover para a Carpeta"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (FIXME)"
+#~ msgid "_Open in New Window"
+#~ msgstr "_Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (FIXME)"
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimir Mensaxe"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Carpeta"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Gardar como..."
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Ir para a Carpeta..."
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Fontes"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "м_ndice"
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "_Borrar"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Carpetas Virtuais"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_ConfiguraciСn"
+#, fuzzy
+#~ msgid "Attach"
+#~ msgstr "IncluМr un ficheiro"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (FIXME)"
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "Gardar o ficheiro actual"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Mensaxe cifrada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Abrir ficheiro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "FСra da Oficina"
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Gardar _Como"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sen InformaciСn"
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Ir А carpeta..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#, fuzzy
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Gardar o ficheiro actual"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_OpciСns"
+#, fuzzy
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Mover mensaxe a unha nova carpeta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Amosar _SС as Horas de Traballo"
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Autor"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Autor"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Autor"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Enviar mensaxes en formato HTML"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Enviar mensaxes en formato HTML"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_TСdalas Persoas e Recursos"
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Borrar esta mensaxe"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "TСdalas _Persoas e Un Recurso"
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Gardar Anexo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "anexo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Enviando unha mensaxe sen asunto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reuniСn:"
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "Abrir..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reuniСn:"
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Engadir a carpeta А sЗa lista de carpetas subscritas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#~ msgid "Refresh List"
+#~ msgstr "Actualizar Lista"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Actualizar Lista de Carpetas"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B de %Y"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Eliminar a carpeta da sЗa lista de carpetas subscritas"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Subscribe"
+#~ msgstr "Subscribir"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
+#~ msgid "Unsubscribe"
+#~ msgstr "Desubscribir"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Display a different folder"
+#~ msgstr "Visualizar unha carpeta diferente"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "E_xit"
+#~ msgstr "_SaМr"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra do Evolution"
+
+#~ msgid "Exit the program"
+#~ msgstr "SaМr do programa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_IniciaciСn"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Amosar informaciСn sobre o Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Amosar a Barra de _Carpetas"
 
-#~ msgid "categories"
-#~ msgstr "categorМas"
+#, fuzzy
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Enviar un Informe de Erro"
+
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Enviar un informe de erro usando o Bug Buddy"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso do Xestor de Co_ntactos"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso da _Axenda"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso do Cliente de _Correo"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Acerca do Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Carpeta"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Ir para a Carpeta..."
+
+#~ msgid "_Index"
+#~ msgstr "м_ndice"
+
+#~ msgid "_Settings"
+#~ msgstr "_ConfiguraciСn"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (FIXME)"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Elemento(s) pertencentes a estas categorМas:"
@@ -7378,9 +6795,6 @@ msgstr "Grupo %i"
 #~ msgid "Preferences"
 #~ msgstr "Preferencias"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmas"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Propiedades da Alarma"
 
diff --git a/po/hu.po b/po/hu.po
index 18ef06b835..9702c3094b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,8 +1,8 @@
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -10,11 +10,185 @@ msgstr ""
 "Content-Type: text/plain; charset=8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Nem tudom a bonobo-t elindМtani"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox formАtumЗ fАjlok"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "A levИl tovАbbМtАsa"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Levelek letЖltИse"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "BezАr"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "MappАba mozgat"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Az elУzУ elemre ugrАs"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "KЖvetkezУ elemre ugrАs"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Mappa beАllМtАsa"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nem tudom mАsolni a fАjlokat\n"
+"'%s'-be."
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "FАjl betЖltИsi hiba: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Nincs hiba"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Nem tudom elindМtani a wombat szervert"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "New"
+msgstr "зj..."
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Egy Зj nИvjegy kИszМtИse"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Nem tudom a bonobo-t elindМtani"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "KАrtya:"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -22,7 +196,7 @@ msgstr ""
 "\n"
 "NИv:  "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -30,7 +204,7 @@ msgstr ""
 "\n"
 " ElУtag:      "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -38,7 +212,7 @@ msgstr ""
 "\n"
 "  Adott:      "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -46,7 +220,7 @@ msgstr ""
 "\n"
 "  EgyИb:      "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -54,7 +228,7 @@ msgstr ""
 "\n"
 "  CsalАdi:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -62,7 +236,7 @@ msgstr ""
 "\n"
 "  UtСtag:     "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -70,7 +244,7 @@ msgstr ""
 "\n"
 "SzЭletИsi dАtum: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -78,7 +252,7 @@ msgstr ""
 "\n"
 "CМm:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -86,7 +260,7 @@ msgstr ""
 "\n"
 "  PostafiСk:   "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -94,7 +268,7 @@ msgstr ""
 "\n"
 " KЭl:"
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -102,7 +276,7 @@ msgstr ""
 "\n"
 "  зt:          "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -110,7 +284,7 @@ msgstr ""
 "\n"
 "  VАros:       "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -118,7 +292,7 @@ msgstr ""
 "\n"
 "  RИgiС:       "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -126,7 +300,7 @@ msgstr ""
 "\n"
 " IrАnyМtСszАm: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -134,13 +308,13 @@ msgstr ""
 "\n"
 "  OrszАg:      "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -148,7 +322,7 @@ msgstr ""
 "\n"
 "Telefonok:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -156,7 +330,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -164,7 +338,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -172,7 +346,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -180,7 +354,7 @@ msgstr ""
 "\n"
 "LevelezУ: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -188,7 +362,7 @@ msgstr ""
 "\n"
 "IdУzСna: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -196,7 +370,7 @@ msgstr ""
 "\n"
 "Hely: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -204,7 +378,7 @@ msgstr ""
 "\n"
 "эzleti szabАly:"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -212,7 +386,7 @@ msgstr ""
 "\n"
 "CИg:"
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -220,7 +394,7 @@ msgstr ""
 "\n"
 " NИv:"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -228,7 +402,7 @@ msgstr ""
 "\n"
 " EgysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -236,7 +410,7 @@ msgstr ""
 "\n"
 " 2. egysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -244,7 +418,7 @@ msgstr ""
 "\n"
 " 3. egysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -252,7 +426,7 @@ msgstr ""
 "\n"
 " 4. egysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -260,7 +434,7 @@ msgstr ""
 "\n"
 "KategСriАk:"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -278,7 +452,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -286,7 +460,7 @@ msgstr ""
 "\n"
 "Egyedi szЖveg:"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -294,17 +468,6 @@ 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-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.
@@ -424,40 +587,32 @@ 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:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem tudom betЖlteni\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs betЖltve\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Nem tudom elindМtani a wombat szervert"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Nem tudom a wombat-ot elindМtani"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Nem tudom a pilot Address application blokkjАt olvasni"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/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.
@@ -467,7 +622,7 @@ msgid "_Add"
 msgstr "HozzА_ad"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_TЖrЖl"
 
@@ -480,14 +635,7 @@ msgstr "Telefon tМpusok"
 msgid "New phone type"
 msgstr "зj telefon tМpus"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "HozzАad"
 
@@ -545,7 +693,6 @@ msgid "C_ontacts..."
 msgstr "_NИvjegyek..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegСriАk..."
 
@@ -562,8 +709,6 @@ msgid "_Address..."
 msgstr "_CМm..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Alap"
 
@@ -608,24 +753,27 @@ msgid "No_tes:"
 msgstr "Felje_gyzИsek:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "RИszletek"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Asszisztens"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "эzleti"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "2. эzleti"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "эzleti fax"
 
@@ -634,6 +782,7 @@ msgid "Callback"
 msgstr "VisszahМvАs"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "AutС"
 
@@ -643,28 +792,33 @@ msgstr "VАllalat"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Otthoni"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "2. Otthoni"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "MАs"
 
@@ -673,10 +827,12 @@ msgid "Other Fax"
 msgstr "EgyИb fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "SzemИlyhМvС"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "ElsУdleges"
 
@@ -693,62 +849,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "2. email"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "3. email"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "2.cМm:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "A cМm ellenУrzИse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Ors_zАg:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "FinnorszАg"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_CМm:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_VАros:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_PostafiСk:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "а_llam/HelytartСsАg:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_IrАnyМtСszА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.
@@ -809,12 +919,7 @@ msgstr "_ElУtag:"
 msgid "As _Minicards"
 msgstr "_KАrtyАkkИnt"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "_TАblАzatkИnt"
 
@@ -848,27 +953,27 @@ msgstr ""
 "hasznАlni egy LDAP szervert, le kell tЖltened Иs\n"
 "telepМtened az OpenLDAP csomagot, Иs ЗjrafordМtani az EvolЗciСt.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "HaladС..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "BАrmely mezУ tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "A nИv tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "Email tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappa BЖngИszУ meg fog nyitni"
 
@@ -897,9 +1002,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "JelszС"
 
@@ -935,12 +1040,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "сrАk"
@@ -960,12 +1063,10 @@ msgid "Search Scope:"
 msgstr "KeresИs"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AuthentikАciС:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "зtvonal:"
 
@@ -991,193 +1092,90 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "NИv:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "LeМrАs:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "ForrАs hozzАadАsa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "TЖrЖl"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Szerkeszt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-#, fuzzy
-msgid "Name"
-msgstr "NИv:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "KeresИs..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "LevИl cМmzettek"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "VАlassz neveket"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "VАlassz egy nevet a listАbСl:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "KeresИs"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "VCard-kИnt mentИs"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#, fuzzy
+msgid "Name"
+msgstr "NИv:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "2. email"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Szervezet"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_OsztАly:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Hivatal:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_BeosztАs:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_FoglalkozАs:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "SzemИlyhМvС"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Be_cenИv:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "HАza_stАrs:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Semmi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard-kИnt mentИs"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "CМmjegyzИkbe mentИs"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1191,179 +1189,6 @@ msgstr ""
 "\n"
 "зj nИvjegy kИszМtИsИhez kattints kettУt ide."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/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:9
-msgid "Body"
-msgstr "TЖrzs"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "AlsС:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "DimenziСk:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "BetШtМpus..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "BetШtМpusok"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "LАblИc:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "FormАtum"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "FejlИc"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "FejlИc/lАblИc"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "FejlИcek"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "FejlИc minden levИlnek"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "MagassАg:"
-
-#: addressbook/printing/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:22
-msgid "Include:"
-msgstr "BeleИrtve:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "FekvУ"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Bal:"
-
-#: addressbook/printing/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:26
-msgid "Margins"
-msgstr "MargСk"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Oszlopok szАma:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "BeАllМtАsok"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "ElhelyezkedИs"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Lap"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Oldal beАllМtАs:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "PapМr"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "PapМr forrАs:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "аllС"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "ElУnИzet:"
-
-#: addressbook/printing/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:37
-msgid "Reverse on even pages"
-msgstr "PАros lapokon fordМtott"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Jobb:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "SzekciСk:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "аrnyalАs"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "MИret:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "зj lapon kezdd"
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "StМlus neve:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "FelsУ:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "TМpus"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "SzИlessИg:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "EvolЗciС naptАr csatorna"
@@ -1372,13 +1197,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "HibАs kommunikАciС a naptАr szerverrel"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem tudom a pilot Calendar application blokkjАt olvasni"
 
@@ -1390,73 +1215,17 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem tudom a pilot Calendar ToDo blokkjАt olvasni"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "NaptАr"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "EvolЗciС naptАr csatorna"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Az EvolЗciС naptАr csatorna beАllМtС eszkЖze.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "A talАlkozСd figyelmeztetУ Эzenete:"
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Szundi"
 
@@ -1466,25 +1235,25 @@ msgstr "Szundi"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Nem talАlom a fАjlt"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "NaptАr megnyitАsa"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "NaptАr mentИse"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1492,60 +1261,57 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "NyilvАnos"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "SzemИlyes"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "и"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "аttetszУ"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1557,7 +1323,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1565,27 +1331,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1595,861 +1361,421 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioritАs 1 Иs 9 kЖzЖtt lehet, bezАrСlag"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_MegjelenМt"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Mutasd az esemИnyek vИgpontjАt"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "csatolАs"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a naptАr megjelenМt"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "RiasztАs idУpontja: %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "TalАlkozС figyelmeztetИs: %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Nincs elИrhetУ ЖsszegzИs."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "BezАr"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "_IdУpont szerkesztИse"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Szundi idУ (percek)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 perc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 perc"
-
-#: calendar/gui/dialogs/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:9
-msgid "15 minutes"
-msgstr "15 perc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 СrАs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 perc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 perc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Hang figyelmeztetИs"
-
-#: calendar/gui/dialogs/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:16
-msgid "Calendar"
-msgstr "NaptАr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "NaptАr beАllМtАsok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "SzМnek"
-
-#: calendar/gui/dialogs/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:20
-msgid "Date navigator options"
-msgstr "DАtum navigАtor beАllМtАsok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "AlapИrtelmezett"
-
-#: calendar/gui/dialogs/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:23
-msgid "Due Date"
-msgstr "LejАrat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "Szundi engedИse"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Nap vИge:"
-
-#: calendar/gui/dialogs/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:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "PИ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "PИntek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "KiemelИs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "A ma lejАrС elemek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "A ma lejАrС elemek:"
-
-#: calendar/gui/dialogs/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:33
-msgid "Items Not Yet Due:"
-msgstr "MИg nem lejАrt elemek:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "HИ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "HИtfУ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "LejАrt elemek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "LejАrt elemek:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "VАlassz egy szМnt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "PrioritАs"
-
-#: calendar/gui/dialogs/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:41
-msgid "Reminders"
-msgstr "EmlИkeztetУk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Szo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "Szombat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Mutasd"
-
-#: calendar/gui/dialogs/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:46
-msgid "Show week numbers"
-msgstr "HИt szАmАnak mutatАsa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Nap kezdete:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Va"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "VasАrnap"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "FeladatTАbla"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "CsЭ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "CsЭtЖrtЖk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "LejАratig hАtralИvУ idУ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "IdУosztАsok:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "IdУ formАtum:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Kedd"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "VizuАlis figyelmeztetИs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Sze"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "Szerda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "MunkahИt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "perc bekЖvetkezИsЭkig."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "mАsodperc."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "TИnyleg tЖrЖlni akarod\n"
 "ezt a nИvjegyet?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% kИsz:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "B_esorolАs"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "TЖrЖlve"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "ElvИgezve"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "TeljesМtИs dАtuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Magas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "Folyamatban"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Alacsony"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Semmi"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "NormАlis"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Nem indult mИg el"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "ж_sszegzИs"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Ke_zdИsi dАtum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Feladat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_NИvjegyek..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr "Le_jАrat:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_PrioritАs:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_StАtusz:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Feladat vИge"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Nincs ЖsszegzИs"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "IdУpont - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "NaplС bejegyzИs - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "kategСriАk"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "BesorolАs"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "ElvИgezve"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "_VИg idУpont:"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Ke_zdИsi dАtum:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "LejАrat"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "MegjelЖlИs mint kИsz feladat"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "PrioritАs"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "ж_sszegzИs"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "аttetszУ"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "иbresztУk"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Megnyit..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "A feladat megnyitАsa"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "KИsznek jelЖl"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "MegjelЖlИs mint kИsz feladat"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "TЖrЖl"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "A feladat tЖrlИse"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i perces osztАs"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "зj _idУpont"
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "A megbeszИlИs szerkesztИse..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "A megbeszИlИs mozgathatСvА tИtele"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "A megjelenИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Minden napos esemИny"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "MegbeszИlИsek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "BesorolАs"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr "Megadott ismИtlУdИs"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Napok"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Minden"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "KivИtelek"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "сrАk"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "LevИl _valakinek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Percek"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "MСdosМtАs"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Nincs ismИtlУdИs"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Preview"
-msgstr "ElУnИzet:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "SzemИ_lyes"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "Nyil_vАnos"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "IsmИtlУdИs"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "IsmИtlУdИsi szabАly"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "EmlИkeztetУ"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "EgyszerШ ismИtlУdИs"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Su_mmary:"
-msgstr "жsszegzИs:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "IdУ"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_Hang"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Bizalmas"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_MegjelenМt"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "_VИg idУpont:"
+msgid "Category:"
+msgstr ""
+"\n"
+"KategСriАk:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_LevИl"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Program"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "_Program indМtАsa:"
+#. 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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "_KezdИsi idУ:"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "MegbeszИlИs szerkesztИse"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Ke_zdИsi dАtum:"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "ekkor:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr "nap"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr "ezИrt:"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr "ЖrЖkkИ"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "hСnapban"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "HИtfУ"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "amМg"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Kedd"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "hИten"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Szerda"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "Иvben"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "CsЭtЖrtЖk"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "MegbeszИlИs szerkesztИse"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "PИntek"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr "ekkor:"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Szombat"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "nap"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "VasАrnap"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "elУfordulАsok"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:696
 #, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nem tudom a dialСgust elkИszМteni."
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Nem tudom elkИszМteni a megadott mappАt:\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "Аprilis"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "augusztus"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "februАr"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "DАtumra ugrАs"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Ugorj mАra"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "januАr"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "jЗlius"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Va"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "jЗnius"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "HИ"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "mАrcius"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Ke"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "HИtfУ"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Sze"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "november"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "CsЭ"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "oktСber"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "PИ"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "szeptember"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Szo"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Nem tudom a bonobo-t elindМtani"
@@ -2643,10 +1969,15 @@ msgstr "EzИv (%Y)"
 msgid "Print Calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "NyomtatАsi elУnИzet"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "Az URI amit a naptАr megjelenМt"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "VHKSCPS"
@@ -2737,61 +2068,69 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s szerver %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "TЖrЖlve"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(ismeretlen szerver)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "NaptАr megnyitАsa"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2801,17 +2140,17 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2827,41 +2166,42 @@ msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 #, 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:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2873,25 +2213,25 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2899,7 +2239,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2908,24 +2248,24 @@ msgstr ""
 "Hiba: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr ""
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "%s helyi levИlkЖnyvtАr"
 
 #: 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 "UNIX mbox formАtumЗ fАjlok"
+msgid "Standard Unix mailbox file"
+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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3254,8 +2594,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3284,71 +2624,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %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 ""
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3396,131 +2735,125 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "AuthentikАciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "%s szerver %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3563,12 +2896,11 @@ msgid "attachment"
 msgstr "csatolАs"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "FАjl csatolАsa"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "TЖrlИs"
 
@@ -3584,57 +2916,41 @@ msgstr "Csatol..."
 msgid "Attach a file to the message"
 msgstr "Csatolj egy fАjlt a levИlhez"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/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 "File name:"
-msgstr "FАjlnИv:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "MIME tМpus:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "FeladС:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "CМmjegyzИkben valС keresИshez kattints ide"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "мrd be a leveleid feladСjАt, amilyen cМmrУl levelezel"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "мrd be a levИl cМmzettjИt"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "мrd be, kik kapjanak mАsolatot a levИlrУl"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3642,11 +2958,11 @@ 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "TИma:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "мrd be a levИl cМmИt (subject)"
 
@@ -3657,40 +2973,40 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "FАjl mentИsi hiba: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "EvolЗciС"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3700,27 +3016,27 @@ msgstr ""
 "\n"
 "Menteni akarod a vАltozАsaidat?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "FАjl megnyitАs"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "A fАjl nem lИtezik."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Nem sima fАjl."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Az a fАjl lИtezik, de nem olvashatС."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3728,29 +3044,24 @@ msgstr ""
 "A fАjl tЗl nagy (100K fЖlЖtti).\n"
 "TИnyleg be szeretnИd szЗrni?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Hiba tЖrtИnt megnyitАs kЖzben."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "LevИl МrАsa"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 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 "year"
 msgstr "Иv"
@@ -3876,7 +3187,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "SzШrУk szerkesztИse"
 
@@ -3975,190 +3286,170 @@ msgstr ""
 msgid "Read"
 msgstr "RАdiС"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "VMappАk szerkesztИse"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "SzШrУ szabАlyok"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "KЖrvonal:"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "VirtuАlis MappАk"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "VMappa forrАsok"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "utАna"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "SzМn hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "PontszАm hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "elУtte"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "tartalmaz"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "MappАba mАsolАs"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "FogadАs dАtuma"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "KЭldИs dАtuma"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "KifejezИs"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "A levИl tovАbbМtАsa cМmre"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "LevИltЖrzs"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "nem tartalmaz"
+#, fuzzy
+msgid "Message Header"
+msgstr "LevИltЖrzs"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "nincs a vИgИn"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "nem lИtezik"
+msgid "Message was sent"
+msgstr "A levИl el lett kЭldve"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "nem Зgy hangzik mint"
+msgid "Move to Folder"
+msgstr "MappАba mozgat"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "nincs az elejИn"
+msgid "Recipients"
+msgstr "CМmzettek"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "a vИgИn van"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "lИtezik"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "PontszАm"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "KifejezИs"
+msgid "Sender"
+msgstr "FeladС"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "A levИl tovАbbМtАsa cМmre"
+#, fuzzy
+msgid "Set Status"
+msgstr "_StАtusz:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "egy"
+msgid "Source"
+msgstr "ForrАs"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "nagyobb mint"
+msgid "Specific header"
+msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "kisebb mint"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_StАtusz:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "nem egy"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "LevИltЖrzs"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "TИma"
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "Message Header"
-msgstr "LevИltЖrzs"
+msgid "after"
+msgstr "utАna"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr ""
+msgid "before"
+msgstr "elУtte"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "A levИl el lett kЭldve"
+msgid "contains"
+msgstr "tartalmaz"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "MappАba mozgat"
+msgid "does not contain"
+msgstr "nem tartalmaz"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "akkor vagy utАn volt"
+msgid "does not end with"
+msgstr "nincs a vИgИn"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "akkor vagy elУbb"
+msgid "does not exist"
+msgstr "nem lИtezik"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "nem Зgy hangzik mint"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "CМmzettek"
+msgid "does not start with"
+msgstr "nincs az elejИn"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "a vИgИn van"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "FeladС"
+msgid "exists"
+msgstr "lИtezik"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "_StАtusz:"
+msgid "is greater than"
+msgstr "nagyobb mint"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "Зgy hangzik, mint"
+msgid "is less than"
+msgstr "kisebb mint"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "ForrАs"
+msgid "is not"
+msgstr "nem egy"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr ""
+msgid "is"
+msgstr "egy"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "Мgy kezdУdik:"
+msgid "on or after"
+msgstr "akkor vagy utАn volt"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_StАtusz:"
+msgid "on or before"
+msgstr "akkor vagy elУbb"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr ""
+msgid "sounds like"
+msgstr "Зgy hangzik, mint"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "TИma"
+msgid "starts with"
+msgstr "Мgy kezdУdik:"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4176,10 +3467,6 @@ 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
-msgid "Score"
-msgstr "PontszАm"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "VMappa szabАly hozzАadАsa"
@@ -4188,219 +3475,167 @@ msgstr "VMappa szabАly hozzАadАsa"
 msgid "Edit VFolder Rule"
 msgstr "VMappa szabАly szerkesztИse"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "MentИs"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "VАlassz mappАt"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "A szЖvegtЖrzs vagy a tИma tartalmaz"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "A szЖvegtЖrzs tartalmaz"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "TИma tartalmaz"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "A szЖvegtЖrzs nem tartalmaz"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "A tИma nem tartalmaz"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VMappa a tИmАra"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VMappa a feladСra"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VMappa a cМmzettekre"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "SzШrУ a tИmАra"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "SzШrУ a feladСn"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "SzШrУ a cМmzettekre"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "SzШrУ a levelezИsi listАra"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Mutasd mind"
-
-#: mail/folder-browser.c:657
-#, fuzzy
-msgid "Hide selected"
-msgstr "TЖrЖlt"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "RejtИs"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "TЖrЖlt"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "TИma"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "SzШrУ a feladСn"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "MegnyitАs"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Szerkeszt"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Ment mint..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Nyomtat"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "TovАbbМt"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "TovАbbМt"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "JelЖlИs olvasottnak"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "JelЖlИs nem olvasottnak"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "MappАba mozgatАs..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "MappАba mАsolАs..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "VisszaАllМt"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "SzШrУk alkalmazАsa"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "A levИlbУl gyАrts szabАlyt"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "LevИl _nyomtatАsa"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "SzШrУ a levelezУ listАra (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "A tИma %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Nem tudom a wombat-ot elindМtani"
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr " ЖsszegzИs"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Semmi"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "зj telefon tМpus"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "AlapИrtelmezett"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "EvolЗciС tennivalС csatorna"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4422,7 +3657,7 @@ msgstr "LevИl %s-tСl"
 msgid "%s mailing list"
 msgstr "%s levelezУlista"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4430,7 +3665,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -4439,7 +3674,7 @@ msgstr ""
 "Egy azonosМtСt be kell АllМtanod\n"
 "mielУtt levelet kЭldessz."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -4448,19 +3683,15 @@ 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
-msgid "You have no mail sources configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Nincs kimenУ mappАd beАllМtva"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4468,521 +3699,94 @@ msgstr ""
 "Nincs tАrgya a levИlnek.\n"
 "TИnyleg elkЭldjem?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Egy azonosМtСt be kell АllМtanod\n"
+"mielУtt levelet kЭldessz."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "FelЭlМrod a fАjlt?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "A megadott nИven mАr lИtezik mappa"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "LevИl _nyomtatАsa"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "LevИl _nyomtatАsa"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Nincs informАciС"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "CsatolАs beАllМtАsok"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "HaladС..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "AuthentikАciС:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "AuthentikАciС:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "AlapИrtelmezett"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "KilИpИs a levИlszerkesztУbУl"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Semmi"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "Email cМm:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "Email cМm:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "LevelezИs beАllМtАsa"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Teljes nИv:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "FelhasznАlСlnИv:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "AzonosМtС"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_LevИl"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "Email tartalmaz"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "LevelezИs beАllМtАsa"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "LevelezИs beАllМtАsa"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "зj..."
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "BeАllМtАsok"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Szervezet:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "JelszС"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Reply-To:"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Reply-To:"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "_A kИrt emberek"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "VCard-kИnt mentИs"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "AlАМrАs fАjl:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "LevelezИs beАllМtАsa"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Szerver:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Szerver:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "AlАМrАs fАjl:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "AlАМrАs fАjl:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "ForrАsok"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "TМpus"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Nincs informАciС"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "FelhasznАlСlnИv:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "percek"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"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:446
-msgid "Full name:"
-msgstr "Teljes nИv:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "Email cМm:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "AlАМrАs fАjl"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Szerver:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "TАmogatott tМpusok detektАlАsa..."
-
-#: 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:1003
-msgid "Test Settings"
-msgstr "BeАllМtАsok tesztelИse"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "LevИl forrАs tМpusa:"
-
-#: mail/mail-config-gui.c:1135
-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:1154
-#, fuzzy
-msgid "News source type:"
-msgstr "зj telefon tМpus"
-
-#: 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:1178
-#, fuzzy
-msgid "Mail transport type:"
-msgstr "LevИl kЭldИs"
-
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-#, fuzzy
-msgid "Add Identity"
-msgstr "AzonosМtС"
-
-#: mail/mail-config-gui.c:1235
-#, fuzzy
-msgid "Edit Identity"
-msgstr "AzonosМtС"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "ForrАs hozzАadАsa"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "ForrАs szerkesztИse"
-
-#: mail/mail-config-gui.c:1430
-#, fuzzy
-msgid "Add News Server"
-msgstr "HМrcsoport-szerverek"
-
-#: mail/mail-config-gui.c:1432
-#, fuzzy
-msgid "Edit News Server"
-msgstr "HМrcsoport-szerverek"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "'%s' tesztelИse"
-
-#: mail/mail-config-gui.c:2255
+#: mail/mail-config-druid.c:363
 #, 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\""
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "CМm"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "AzonosМtСk"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "LevИl forrАsok"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "LevИl kЭldИs"
-
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "_Minden olvasott levИl kijelЖlИse"
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "HМrcsoport-szerverek"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "HМrcsoport forrАsok"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Szervezet"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "A levelet HTML formАtumban kЭldd"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Nincs elИrhetУ GPG/PGP program."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5022,68 +3826,68 @@ msgstr "Megnyit..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 #, fuzzy
 msgid "External Viewer"
 msgstr "KЭlsУ kЖnyvtАrak"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "RejtИs"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatolАs"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Nincs az EvolЗciСnak ebben a pИldАnyАban GPG/PGP tАmogatАs."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Reply-To:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "HibАs Эzenet az feladС threadtУl?"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "LevИl elkЭldИse"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5144,7 +3948,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr "зj mappa kИszМtИse"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5170,160 +3974,160 @@ msgstr "FАjl betЖltИsi hiba: %s"
 msgid "Working"
 msgstr "MozgatАs alatt"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' kЭldИs alatt"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "A levИl tЖrlИse"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "MozgatАs alatt"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "MАsolАs alatt"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Nincs leМrАs)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "SzinkronizАlАs"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "LevИl lista rendezИse tИma szerint"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "LevИl МrАsa"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "%s mappa tЖltУdik"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "%s mappa betЖltИse"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "LevИl МrАsa"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5334,7 +4138,7 @@ msgstr "FАjl mentИsi hiba: %s"
 msgid "Cancel"
 msgstr "MИgsem"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Nem teljes Эzenet lett a csУbe Мrva!"
 
@@ -5436,116 +4240,195 @@ msgstr "зj VMappa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "VАlasz"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 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:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "VАlasz a feladСnak Иs az Жsszes cМmzettnek"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "A levИl tovАbbМtАsa"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "A levИl nyomtatАsa"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "A levИl tЖrlИse"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Nem nИzett"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "NИzett"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "MegvАlaszolt"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ismeretlen"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "csatolАs"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "FeladС:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "LejАrat"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "FogadАs dАtuma"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "To:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "MИret:"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Nincs elИrhetУ GPG/PGP program."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "MappАk"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "PontszАm"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, fuzzy, c-format
 msgid "Getting store for \"%s\""
 msgstr "_IndulАshoz"
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5657,23 +4540,24 @@ msgstr ""
 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:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(NИvtelen)"
 
-#: shell/e-shell-view-menu.c:111
+#: 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."
 
-#: shell/e-shell-view-menu.c:117
+#: 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
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5683,7 +4567,7 @@ msgstr ""
 "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:334
 msgid "Go to folder..."
 msgstr "MappАba menj..."
 
@@ -5691,13 +4575,18 @@ msgstr "MappАba menj..."
 msgid "(No folder displayed)"
 msgstr "(Nincs mappa mutatva)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "MappАk"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "EvolЗciС - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "EvolЗciС - %s"
 
 #: shell/e-shell.c:372
@@ -5705,76 +4594,86 @@ msgstr "EvolЗciС - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Egy Зj nИvjegy kИszМtИse"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Csoport neve:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok mutatАsa az elemeken"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok mutatАsa az elemeken"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "з_j csoport..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Egy Зj nИvjegy kИszМtИse"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Nagy ikonok mutatАsa az elemeken"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Nagy ikonok mutatАsa az elemeken"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "AktivАl"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Az elem aktivАlАsa"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 
@@ -5782,12 +4681,11 @@ 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-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_NИzet"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "A kijelЖlt mappАk megtekintИse"
 
@@ -5901,1382 +4799,1872 @@ msgstr "TiltАs."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem tudom elindМtani a Bonobo komponens rendszert."
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-contact-editor.xml:7
 #, fuzzy
-msgid "Create a new contact"
-msgstr "Egy Зj nИvjegy kИszМtИse"
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _IdУpont"
 
-#: ui/evolution-addressbook.xml.h:9
-#, fuzzy
-msgid "Delete a contact"
-msgstr "NИvjegy tЖrlИse?"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: TalАlkozС _felhМvАs"
+
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _LevИl"
+
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _CМmjegyzИk"
+
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Feladat"
+
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Feladat f_elhМvАs"
+
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _NaplС bejegyzИs"
+
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _FeljegyzИs"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+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"
+
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "Find"
-msgstr "FinnorszАg"
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: NyomtatАsi stМlusok definiАlАsa..."
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr ""
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: _ElkЭld"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: ui/evolution-contact-editor.xml:35
+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..."
+
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: MappАba mАso_l..."
+
+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
+msgstr "Oldal _beАllМtАs:"
+
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: NyomtatАs nИ_zet"
+
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "New"
-msgstr "зj..."
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: _SpeciАlis beillesztИs"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr ""
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
+msgstr "FIXME: Ne_m olvasottnak jelЖl"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr ""
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objektum"
+
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+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"
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _UtolsС elem a mappАban"
+
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: а_ltalАnos"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-contact-editor.xml:93
 #, fuzzy
-msgid "Stop Loading"
-msgstr "аrnyalАs"
+msgid "FIXME: __Formatting"
+msgstr "FIXME: __FormАzАs"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _BeАllМt..."
+
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "E_lУzУ"
+
+#: ui/evolution-contact-editor.xml:102
 #, fuzzy
-msgid "View All"
-msgstr "Mutasd mind"
+msgid "Ne_xt"
+msgstr "KЖ_vetkezУ"
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr ""
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_EszkЖzЖk"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _FАjl..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: Elem..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objektum..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _BetШtМpus..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: B_ekezdИs..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: AktuАlis kИrdУМv _tervezИse"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: KИrdУМv t_ervezИse"
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: KИrdУМv _publikАlАsa"
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: KИrdУМv publikАlАsa _mint..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Szkript _hibakeresУ"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _HelyesМrАs..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_KИrdУМvek"
+
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "FIXME: з_j nИvjegy"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "FIXME: зj nИvjegy ugyanannАl a _cИgnИl"
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: LevИl ennek a _szemИlynek"
+
+#: ui/evolution-contact-editor.xml:146
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "LevelezИs beАllМtАsa"
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: LevИl ennek a _szemИlynek"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Ta_lАlkozС ezzel a szemИllyel"
+
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _TalАlkozС tervezИse"
+
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: зj feladat a nИvjegyhez"
+
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: зj naplС bejegyzИs a nИvjegyhez"
+
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: _ZАszlС folytatАshoz..."
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: _TИrkИp vagy cМm megjelenМtИse"
+
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: _Weblap megnyitАsa"
+
+#: ui/evolution-contact-editor.xml:156
 #, fuzzy
-msgid "_Print Contacts..."
-msgstr "_NИvjegyek..."
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: _vCard-kИnt tovАbbkЭld"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr ""
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: _TovАbbМt"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Beilleszt"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormАtum"
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
+#: ui/evolution-contact-editor.xml:171
 msgid "_Tools"
 msgstr "_EszkЖzЖk"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "5 Days"
-msgstr "Napok"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "_MШveletek"
 
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Alter preferences"
-msgstr "NaptАr beАllМtАsok"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "FIXME: ElУzУ"
 
-#: ui/evolution-calendar.xml.h:8
-#, fuzzy
-msgid "Ca_lendar"
-msgstr "NaptАr"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Az elУzУ elemre ugrАs"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-contact-editor.xml:249
 #, fuzzy
-msgid "Calendar Preferences..."
-msgstr "NaptАr beАllМtАsok"
+msgid "FIXME: Next"
+msgstr "FIXME: _FeljegyzИs"
 
-#: ui/evolution-calendar.xml.h:10
-#, fuzzy
-msgid "Create a new appointment"
-msgstr "A megbeszИlИs tЖrlИse"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "KЖvetkezУ elemre ugrАs"
 
-#: ui/evolution-calendar.xml.h:11
-#, fuzzy
-msgid "Create a new calendar"
-msgstr "зj mappa kИszМtИse"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Day"
-msgstr "Napok"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "KМsИrleti"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Foglalt"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "эzemen kМvЭl"
 
-#: ui/evolution-calendar.xml.h:15
-#, fuzzy
-msgid "Go to"
-msgstr "DАtumra ugrАs"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Nincs informАciС"
 
-#: ui/evolution-calendar.xml.h:16
-#, fuzzy
-msgid "Go to a specific date"
-msgstr "DАtumra ugrАs"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_MАsok meghМvАsa..."
 
-#: ui/evolution-calendar.xml.h:17
-#, fuzzy
-msgid "Go to present time"
-msgstr "KЖvetkezУ elemre ugrАs"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_BeАllМtАsok"
 
-#: ui/evolution-calendar.xml.h:18
-#, fuzzy
-msgid "Month"
-msgstr "hСnap"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Csak a _munkaСrАk mutatАsa"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-#, fuzzy
-msgid "Next"
-msgstr "KЖ_vetkezУ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "_NagyМtott mutatАsa"
 
-#: ui/evolution-calendar.xml.h:21
-#, fuzzy
-msgid "Open a calendar"
-msgstr "NaptАr megnyitАsa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Szabad/foglalt frissМtИse"
 
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Prev"
-msgstr "ElУnИzet:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Print this calendar"
-msgstr "NaptАr nyomtatАsa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_Automatikus kiszedИs"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Minden ember Иs erУforrАs"
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Minden _ember Иs egy erУforrАs"
 
-#: ui/evolution-calendar.xml.h:28
-#, fuzzy
-msgid "Show 1 week"
-msgstr "HИt szАmАnak mutatАsa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_A kИrt emberek"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "A kИrt emberek Иs egy e_rУforrАs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "MegbeszИlИs _kezdУdik:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "MegbeszИlИs _vИge:"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Minden meghМvott"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "HKSCPsV"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Most"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Ma"
 
-#: ui/evolution-calendar.xml.h:31
-#, fuzzy
-msgid "Week"
-msgstr "hИt"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-#, fuzzy
-msgid "_New"
-msgstr "_NИzet"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-calendar.xml.h:33
+#: widgets/misc/e-search-bar.c:176
 #, fuzzy
-msgid "_Open Calendar"
-msgstr "NaptАr megnyitАsa"
+msgid "Sear_ch"
+msgstr "KeresИs"
 
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
-msgid "_Print this calendar"
-msgstr "NaptАr nyomtatАsa"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "CsoportosМtАs %i"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "Ment mint..."
+#~ msgid "Delete Contact?"
+#~ msgstr "NИvjegy tЖrlИse?"
 
-#: ui/evolution-contact-editor.xml.h:7
-#, fuzzy
-msgid "Delete this item"
-msgstr "A megbeszИlИs tЖrlИse"
+#~ msgid "Address _2:"
+#~ msgstr "2.cМm:"
 
-#: ui/evolution-contact-editor.xml.h:8
-#, fuzzy
-msgid "Delete..."
-msgstr "TЖrЖl"
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr ""
+#~ msgid "Check Address"
+#~ msgstr "A cМm ellenУrzИse"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr ""
+#~ msgid "Countr_y:"
+#~ msgstr "Ors_zАg:"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-#, fuzzy
-msgid "Print this item"
-msgstr "TennivalС szerkesztИse"
+#~ msgid "Finland"
+#~ msgstr "FinnorszАg"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "_Address:"
+#~ msgstr "_CМm:"
+
+#~ msgid "_City:"
+#~ msgstr "_VАros:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "_PostafiСk:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "а_llam/HelytartСsАg:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_IrАnyМtСszАm:"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 #, fuzzy
-msgid "Print..."
-msgstr "Nyomtat"
+#~ msgid "Addressbook Sources"
+#~ msgstr "ForrАs hozzАadАsa"
+
+#~ msgid "Find..."
+#~ msgstr "KeresИs..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "LevИl cМmzettek"
+
+#~ msgid "Select Names"
+#~ msgstr "VАlassz neveket"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-msgid "Save _As..."
-msgstr "Ment mint..."
+#~ msgid "Select name from:"
+#~ msgstr "VАlassz egy nevet a listАbСl:"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr ""
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr ""
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr ""
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "A vИgИn a formok ЭrМtИse:"
+
+#~ msgid "Body"
+#~ msgstr "TЖrzs"
+
+#~ msgid "Bottom:"
+#~ msgstr "AlsС:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "DimenziСk:"
+
+#~ msgid "Font..."
+#~ msgstr "BetШtМpus..."
+
+#~ msgid "Fonts"
+#~ msgstr "BetШtМpusok"
+
+#~ msgid "Footer:"
+#~ msgstr "LАblИc:"
+
+#~ msgid "Format"
+#~ msgstr "FormАtum"
+
+#~ msgid "Header"
+#~ msgstr "FejlИc"
+
+#~ msgid "Header/Footer"
+#~ msgstr "FejlИc/lАblИc"
+
+#~ msgid "Headings"
+#~ msgstr "FejlИcek"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "FejlИc minden levИlnek"
+
+#~ msgid "Height:"
+#~ msgstr "MagassАg:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "RЖgtЖn egymАs utАn kЖvetkeznek"
+
+#~ msgid "Include:"
+#~ msgstr "BeleИrtve:"
+
+#~ msgid "Landscape"
+#~ msgstr "FekvУ"
+
+#~ msgid "Left:"
+#~ msgstr "Bal:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "LevИl cМmkИk minden lapon"
+
+#~ msgid "Margins"
+#~ msgstr "MargСk"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Oszlopok szАma:"
+
+#~ msgid "Options"
+#~ msgstr "BeАllМtАsok"
+
+#~ msgid "Orientation"
+#~ msgstr "ElhelyezkedИs"
+
+#~ msgid "Page"
+#~ msgstr "Lap"
+
+#~ msgid "Page Setup:"
+#~ msgstr "Oldal beАllМtАs:"
+
+#~ msgid "Paper"
+#~ msgstr "PapМr"
+
+#~ msgid "Paper source:"
+#~ msgstr "PapМr forrАs:"
+
+#~ msgid "Portrait"
+#~ msgstr "аllС"
+
+#~ msgid "Preview:"
+#~ msgstr "ElУnИzet:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "NyomatАs szЭrkeskАlАs АrnyalАssal"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "PАros lapokon fordМtott"
+
+#~ msgid "Right:"
+#~ msgstr "Jobb:"
+
+#~ msgid "Sections:"
+#~ msgstr "SzekciСk:"
+
+#~ msgid "Shading"
+#~ msgstr "аrnyalАs"
+
+#~ msgid "Start on a new page"
+#~ msgstr "зj lapon kezdd"
+
+#~ msgid "Style name:"
+#~ msgstr "StМlus neve:"
+
+#~ msgid "Top:"
+#~ msgstr "FelsУ:"
+
+#~ msgid "Type:"
+#~ msgstr "TМpus"
+
+#~ msgid "Width:"
+#~ msgstr "SzИlessИg:"
+
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "FIXME: эze_net ennek a szemИlynek"
+#~ msgid "Calendar Server"
+#~ msgstr "NaptАr"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
 #, fuzzy
-msgid "_File"
-msgstr "_Mobil"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
-#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
-msgid "_Print..."
-msgstr "Nyomtat"
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "EvolЗciС naptАr csatorna"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
-msgid "_Save"
-msgstr "MentИs"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Az EvolЗciС naptАr csatorna beАllМtС eszkЖze.\n"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
+#~ msgid "Edit appointment"
+#~ msgstr "_IdУpont szerkesztИse"
 
-#: ui/evolution-event-editor.xml.h:7
-#, fuzzy
-msgid "About..."
-msgstr "BetШtМpus..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Szundi idУ (percek)"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "_MШveletek"
+#~ msgid "05 minutes"
+#~ msgstr "05 perc"
 
-#: ui/evolution-event-editor.xml.h:9
-#, fuzzy
-msgid "C_lear"
-msgstr "NaptАr"
+#~ msgid "10 minutes"
+#~ msgstr "10 perc"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr ""
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 СrАs (de/du)"
 
-#: ui/evolution-event-editor.xml.h:11
-#, fuzzy
-msgid "Clear"
-msgstr "NaptАr"
+#~ msgid "15 minutes"
+#~ msgstr "15 perc"
 
-#: ui/evolution-event-editor.xml.h:12
-#, fuzzy
-msgid "Clear the selection"
-msgstr "A kijelЖlt mappАk megtekintИse"
+#~ msgid "24 hour"
+#~ msgstr "24 СrАs"
 
-#: ui/evolution-event-editor.xml.h:14
-#, fuzzy
-msgid "Close this appointment"
-msgstr "A megbeszИlИs tЖrlИse"
+#~ msgid "30 minutes"
+#~ msgstr "30 perc"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 perc"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Hang figyelmeztetИs"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "SМpolj a figyelmeztetУ ablak megjelenИsekor."
+
+#~ msgid "Calendar"
+#~ msgstr "NaptАr"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "NaptАr beАllМtАsok"
+
+#~ msgid "Colors"
+#~ msgstr "SzМnek"
+
+#~ msgid "Compress weekends"
+#~ msgstr "A hИtvИgИk ЖsszenyomАsa"
+
+#~ msgid "Date navigator options"
+#~ msgstr "DАtum navigАtor beАllМtАsok"
+
+#~ msgid "Defaults"
+#~ msgstr "AlapИrtelmezett"
+
+#~ msgid "Display options"
+#~ msgstr "MegjelenМtИsi beАllМtАsok"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 #, fuzzy
-msgid "Copy"
-msgstr "VАllalat"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Szundi engedИse"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+#~ msgid "End of day:"
+#~ msgstr "Nap vИge:"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr ""
+#~ msgid "First day of week:"
+#~ msgstr "A hИt elsУ napja:"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr ""
+#~ msgid "Highlight"
+#~ msgstr "KiemelИs"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#~ msgid "Items Due Today"
+#~ msgstr "A ma lejАrС elemek"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#~ msgid "Items Due Today:"
+#~ msgstr "A ma lejАrС elemek:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "MИg nem lejАrt elemek"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "MИg nem lejАrt elemek:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "LejАrt elemek"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "LejАrt elemek:"
+
+#~ msgid "Pick a color"
+#~ msgstr "VАlassz egy szМnt"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Minden talАlkozСra figyelmeztess"
+
+#~ msgid "Reminders"
+#~ msgstr "EmlИkeztetУk"
+
+#~ msgid "Show"
+#~ msgstr "Mutasd"
+
+#~ msgid "Show week numbers"
+#~ msgstr "HИt szАmАnak mutatАsa"
+
+#~ msgid "Start of day:"
+#~ msgstr "Nap kezdete:"
+
+#~ msgid "TaskPad"
+#~ msgstr "FeladatTАbla"
+
+#~ msgid "Time Until Due"
+#~ msgstr "LejАratig hАtralИvУ idУ"
+
+#~ msgid "Time divisions:"
+#~ msgstr "IdУosztАsok:"
+
+#~ msgid "Time format:"
+#~ msgstr "IdУ formАtum:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "VizuАlis figyelmeztetИs"
+
+#~ msgid "Work week"
+#~ msgstr "MunkahИt"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "perc bekЖvetkezИsЭkig."
+
+#~ msgid "seconds."
+#~ msgstr "mАsodperc."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% kИsz:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "B_esorolАs"
+
+#~ msgid "Date Completed:"
+#~ msgstr "TeljesМtИs dАtuma:"
+
+#~ msgid "High"
+#~ msgstr "Magas"
+
+#~ msgid "In Progress"
+#~ msgstr "Folyamatban"
+
+#~ msgid "Low"
+#~ msgstr "Alacsony"
+
+#~ msgid "Normal"
+#~ msgstr "NormАlis"
+
+#~ msgid "Not Started"
+#~ msgstr "Nem indult mИg el"
+
+#~ msgid "Task"
+#~ msgstr "Feladat"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_NИvjegyek..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "Le_jАrat:"
+
+#~ msgid "_Priority:"
+#~ msgstr "_PrioritАs:"
+
+#~ msgid "_Status:"
+#~ msgstr "_StАtusz:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Minden napos esemИny"
 
-#: ui/evolution-event-editor.xml.h:23
 #, fuzzy
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _BetШtМpus..."
+#~ msgid "Appointment Basics"
+#~ msgstr "MegbeszИlИsek:"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: VАlassz f_ormАt..."
+#~ msgid "Custom recurrence"
+#~ msgstr "Megadott ismИtlУdИs"
+
+#~ msgid "Days"
+#~ msgstr "Napok"
+
+#~ msgid "Every"
+#~ msgstr "Minden"
+
+#~ msgid "Exceptions"
+#~ msgstr "KivИtelek"
+
+#~ msgid "Hours"
+#~ msgstr "сrАk"
+
+#~ msgid "Mail _to:"
+#~ msgstr "LevИl _valakinek:"
+
+#~ msgid "Minutes"
+#~ msgstr "Percek"
+
+#~ msgid "Modify"
+#~ msgstr "MСdosМtАs"
+
+#~ msgid "No recurrence"
+#~ msgstr "Nincs ismИtlУdИs"
 
-#: ui/evolution-event-editor.xml.h:25
 #, fuzzy
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: _Feladat"
+#~ msgid "Preview"
+#~ msgstr "ElУnИzet:"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: MappАba mАso_l..."
+#~ msgid "Pri_vate"
+#~ msgstr "SzemИ_lyes"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: KИrdУМv t_ervezИse"
+#~ msgid "Pu_blic"
+#~ msgstr "Nyil_vАnos"
+
+#~ msgid "Recurrence"
+#~ msgstr "IsmИtlУdИs"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "IsmИtlУdИsi szabАly"
+
+#~ msgid "Reminder"
+#~ msgstr "EmlИkeztetУ"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "EgyszerШ ismИtlУdИs"
 
-#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: NyomtatАsi stМlusok definiАlАsa..."
+#~ msgid "Su_mmary:"
+#~ msgstr "жsszegzИs:"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: AktuАlis kИrdУМv _tervezИse"
+#~ msgid "Time"
+#~ msgstr "IdУ"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: ElsУ e_lem a mappАban"
+#~ msgid "_Audio"
+#~ msgstr "_Hang"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: _TovАbbМt"
+#~ msgid "_Confidential"
+#~ msgstr "_Bizalmas"
+
+#~ msgid "_Mail"
+#~ msgstr "_LevИl"
+
+#~ msgid "_Program"
+#~ msgstr "_Program"
+
+#~ msgid "_Run program:"
+#~ msgstr "_Program indМtАsa:"
+
+#~ msgid "_Start time:"
+#~ msgstr "_KezdИsi idУ:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Ke_zdИsi dАtum:"
+
+#~ msgid "day(s)"
+#~ msgstr "nap"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "ezИrt:"
+
+#~ msgid "forever"
+#~ msgstr "ЖrЖkkИ"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "hСnapban"
+
+#~ msgid "until"
+#~ msgstr "amМg"
+
+#~ msgid "week(s)"
+#~ msgstr "hИten"
+
+#~ msgid "year(s)"
+#~ msgstr "Иvben"
 
-#: ui/evolution-event-editor.xml.h:32
 #, fuzzy
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: _vCard-kИnt tovАbbkЭld"
+#~ msgid "April"
+#~ msgstr "Аprilis"
 
-#: ui/evolution-event-editor.xml.h:33
 #, fuzzy
-msgid "FIXME: Help"
-msgstr "FIXME: KЖvetkezУ"
+#~ msgid "August"
+#~ msgstr "augusztus"
 
-#: ui/evolution-event-editor.xml.h:34
 #, fuzzy
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: _Feladat"
+#~ msgid "December"
+#~ msgstr "december"
 
-#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
-msgid "FIXME: Insert File"
-msgstr "FIXME: _Elem"
+#~ msgid "February"
+#~ msgstr "februАr"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: Elem..."
+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "DАtumra ugrАs"
 
-#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: _SpeciАlis beillesztИs"
+#~ msgid "Go To Today"
+#~ msgstr "Ugorj mАra"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: NyomtatАs nИ_zet"
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "januАr"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: KИrdУМv publikАlАsa _mint..."
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "jЗlius"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: KИrdУМv _publikАlАsa"
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "jЗnius"
 
-#: ui/evolution-event-editor.xml.h:41
 #, fuzzy
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Objektum..."
+#~ msgid "March"
+#~ msgstr "mАrcius"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: _ElkЭld"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "HИtfУ"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: CsatolАsok me_ntИse..."
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "november"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Szkript _hibakeresУ"
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "oktСber"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Feladat f_elhМvАs"
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "szeptember"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _CМmjegyzИk"
+#~ msgid "Attachment properties"
+#~ msgstr "CsatolАs beАllМtАsok"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _BeАllМt..."
+#~ msgid "File name:"
+#~ msgstr "FАjlnИv:"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _FАjl..."
+#~ msgid "MIME type:"
+#~ msgstr "MIME tМpus:"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _BetШtМpus..."
+#~ msgid "Edit VFolders"
+#~ msgstr "VMappАk szerkesztИse"
+
+#~ msgid "Filter Rules"
+#~ msgstr "SzШrУ szabАlyok"
 
-#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "FIXME: __FormАzАs"
+#~ msgid "Outgoing"
+#~ msgstr "KЖrvonal:"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elem"
+#~ msgid "Virtual Folders"
+#~ msgstr "VirtuАlis MappАk"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _NaplС bejegyzИs"
+#~ msgid "vFolder Sources"
+#~ msgstr "VMappa forrАsok"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _UtolsС elem a mappАban"
+#~ msgid "Save"
+#~ msgstr "MentИs"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _LevИl"
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Mutasd mind"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo stМlus"
+#, fuzzy
+#~ msgid "Hide selected"
+#~ msgstr "TЖrЖlt"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _MappАba mozgat..."
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "RejtИs"
 
-#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _IdУpont"
+#~ msgid "Hide deleted"
+#~ msgstr "TЖrЖlt"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _FeljegyzИs"
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "TИma"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objektum..."
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "SzШrУ a feladСn"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: B_ekezdИs..."
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "LevИl _nyomtatАsa"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _HelyesМrАs..."
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "A tИma %s"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: а_ltalАnos"
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Nem tudom a wombat-ot elindМtani"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Feladat"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr " ЖsszegzИs"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Nem olvasott elem"
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "зj telefon tМpus"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormАtum"
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Nincs informАciС"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "CsatolАs beАllМtАsok"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "HaladС..."
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "KЖvetkezУ elemre ugrАs"
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "AuthentikАciС:"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Az elУzУ elemre ugrАs"
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "AuthentikАciС:"
 
-#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "TennivalС lista beАllМtАsai"
+#~ msgid "Delete mail from server"
+#~ msgstr "KilИpИs a levИlszerkesztУbУl"
 
-#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "KЖ_vetkezУ"
+#~ msgid "Done"
+#~ msgstr "Semmi"
 
-#: ui/evolution-event-editor.xml.h:75
 #, fuzzy
-msgid "Paste"
-msgstr "Lap"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Email cМm:"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr ""
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "Email cМm:"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "E_lУzУ"
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "E_lУzУ"
+#~ msgid "Full Name:"
+#~ msgstr "Teljes nИv:"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr ""
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "FelhasznАlСlnИv:"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "Oldal beАllМtАs:"
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#~ msgid "Identity"
+#~ msgstr "AzonosМtС"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "иbresztУ beАllМtАsok"
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "RАdiС"
+#~ msgid "Mail"
+#~ msgstr "_LevИl"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Email tartalmaz"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "VАlasz"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "зj..."
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "BeАllМtАsok"
+
+#~ msgid "Organization:"
+#~ msgstr "Szervezet:"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
-msgid "Save the current file"
-msgstr "JelenidУre ugrАs"
+#~ msgid "Password:"
+#~ msgstr "JelszС"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Reply-to:"
+#~ msgstr "Reply-To:"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "_A kИrt emberek"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "VCard-kИnt mentИs"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "AlАМrАs fАjl:"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "VАlassz mappАt"
+#~ msgid "Server Configuration"
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
-msgid "Select everything"
-msgstr "VАlassz mappАt"
+#~ msgid "Server Type: "
+#~ msgstr "Szerver:"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Szerver:"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
+#~ msgid "Signature file:"
+#~ msgstr "AlАМrАs fАjl:"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "AlАМrАs fАjl:"
+
+#~ msgid "Sources"
+#~ msgstr "ForrАsok"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
-msgid "_About..."
-msgstr "BetШtМpus..."
+#~ msgid "Type"
+#~ msgstr "TМpus"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
-msgid "_Close"
-msgstr "BezАr"
+#~ msgid "User Information"
+#~ msgstr "Nincs informАciС"
+
+#~ msgid "Username:"
+#~ msgstr "FelhasznАlСlnИv:"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "_VАllalat:"
+#~ msgid "minute(s)"
+#~ msgstr "percek"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "Full name:"
+#~ msgstr "Teljes nИv:"
+
+#~ msgid "Email address:"
+#~ msgstr "Email cМm:"
+
+#~ msgid "Signature File"
+#~ msgstr "AlАМrАs fАjl"
+
+#~ msgid "Server:"
+#~ msgstr "Szerver:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "TАmogatott tМpusok detektАlАsa..."
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 #, fuzzy
-msgid "_Edit"
-msgstr "Szerkeszt"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "KilИpИs a levИlszerkesztУbУl"
+
+#~ msgid "Test Settings"
+#~ msgstr "BeАllМtАsok tesztelИse"
+
+#~ msgid "Mail source type:"
+#~ msgstr "LevИl forrАs tМpusa:"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "KeresИs..."
+#~ msgid "News source type:"
+#~ msgstr "зj telefon tМpus"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_KИrdУМvek"
+#, fuzzy
+#~ msgid "Mail transport type:"
+#~ msgstr "LevИl kЭldИs"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
 #, fuzzy
-msgid "_Help"
-msgstr "_Otthoni"
+#~ msgid "Add Identity"
+#~ msgstr "AzonosМtС"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Beilleszt"
+#, fuzzy
+#~ msgid "Edit Identity"
+#~ msgstr "AzonosМtС"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objektum"
+#~ msgid "Add Source"
+#~ msgstr "ForrАs hozzАadАsa"
+
+#~ msgid "Edit Source"
+#~ msgstr "ForrАs szerkesztИse"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "_VezetИknИv:"
+#~ msgid "Add News Server"
+#~ msgstr "HМrcsoport-szerverek"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "Nyomtat"
+#~ msgid "Edit News Server"
+#~ msgstr "HМrcsoport-szerverek"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "'%s' tesztelИse"
+
+#~ msgid "Address"
+#~ msgstr "CМm"
+
+#~ msgid "Identities"
+#~ msgstr "AzonosМtСk"
+
+#~ msgid "Mail Sources"
+#~ msgstr "LevИl forrАsok"
+
+#~ msgid "Mail Transport"
+#~ msgstr "LevИl kЭldИs"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "иbresztУ beАllМtАsok"
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "_Minden olvasott levИl kijelЖlИse"
+
+#~ msgid "News Servers"
+#~ msgstr "HМrcsoport-szerverek"
+
+#~ msgid "News Sources"
+#~ msgstr "HМrcsoport forrАsok"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "A levelet HTML formАtumban kЭldd"
+
+#~ 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."
 
-#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
-msgid "_Redo"
-msgstr "RАdiС"
+#~ msgid "Delete a contact"
+#~ msgstr "NИvjegy tЖrlИse?"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
+#, fuzzy
+#~ msgid "Find"
+#~ msgstr "FinnorszАg"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_EszkЖzЖk"
+#, fuzzy
+#~ msgid "Stop Loading"
+#~ msgstr "аrnyalАs"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr ""
+#, fuzzy
+#~ msgid "View All"
+#~ msgstr "Mutasd mind"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
 #, fuzzy
-msgid "Compose"
-msgstr "BezАr"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution-mail.xml.h:7
 #, fuzzy
-msgid "Compose a new message"
-msgstr "LevИl МrАsa"
+#~ msgid "_Print Contacts..."
+#~ msgstr "_NИvjegyek..."
 
-#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "LevИl mozgatАsa mАs mappАba"
+#~ msgid "5 Days"
+#~ msgstr "Napok"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "MappАk"
+#~ msgid "Alter preferences"
+#~ msgstr "NaptАr beАllМtАsok"
 
-#: ui/evolution-mail.xml.h:14
 #, fuzzy
-msgid "Fi_lter on Sender"
-msgstr "SzШrУ a feladСn"
+#~ msgid "Ca_lendar"
+#~ msgstr "NaptАr"
 
-#: ui/evolution-mail.xml.h:15
 #, fuzzy
-msgid "Filter on Rec_ipients"
-msgstr "SzШrУ a cМmzettekre"
+#~ msgid "Calendar Preferences..."
+#~ msgstr "NaptАr beАllМtАsok"
 
-#: ui/evolution-mail.xml.h:16
 #, fuzzy
-msgid "Forget _Passwords"
-msgstr "JelszС"
+#~ msgid "Create a new appointment"
+#~ msgstr "A megbeszИlИs tЖrlИse"
 
-#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Get Mail"
-msgstr "RИszletek"
+#~ msgid "Create a new calendar"
+#~ msgstr "зj mappa kИszМtИse"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "A levИl nyomtatАsa"
+#~ msgid "Day"
+#~ msgstr "Napok"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Forwarded message - %s"
+#~ msgid "Go to"
+#~ msgstr "DАtumra ugrАs"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "A levИl nyomtatАsa"
+#~ msgid "Go to a specific date"
+#~ msgstr "DАtumra ugrАs"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "SzШrУk szerkesztИse"
+#~ msgid "Go to present time"
+#~ msgstr "KЖvetkezУ elemre ugrАs"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "LeМrАs:"
+#~ msgid "Month"
+#~ msgstr "hСnap"
 
-#: ui/evolution-mail.xml.h:27
 #, fuzzy
-msgid "Mar_k As Read"
-msgstr "JelЖlИs olvasottnak"
+#~ msgid "Open a calendar"
+#~ msgstr "NaptАr megnyitАsa"
 
-#: ui/evolution-mail.xml.h:28
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "JelЖlИs nem olvasottnak"
+#~ msgid "Prev"
+#~ msgstr "ElУnИzet:"
 
-#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Move"
-msgstr "H"
+#~ msgid "Print this calendar"
+#~ msgstr "NaptАr nyomtatАsa"
 
-#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Move message to a new folder"
-msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
+#~ msgid "Show 1 week"
+#~ msgstr "HИt szАmАnak mutatАsa"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#, fuzzy
+#~ msgid "Week"
+#~ msgstr "hИt"
 
-#: ui/evolution-mail.xml.h:33
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "NyomtatАsi elУnИzet"
+#~ msgid "_New"
+#~ msgstr "_NИzet"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "NaptАr megnyitАsa"
 
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "LevИl _nyomtatАsa"
+#~ msgid "_Print this calendar"
+#~ msgstr "NaptАr nyomtatАsa"
 
-#: ui/evolution-mail.xml.h:39
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Mindenkinek"
+#~ msgid "_Save As..."
+#~ msgstr "Ment mint..."
 
-#: ui/evolution-mail.xml.h:40
 #, fuzzy
-msgid "Reply to _Sender"
-msgstr "Mindenkinek"
+#~ msgid "Delete this item"
+#~ msgstr "A megbeszИlИs tЖrlИse"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-msgid "Select _All"
-msgstr "VАlassz mappАt"
+#~ msgid "Delete..."
+#~ msgstr "TЖrЖl"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#, fuzzy
+#~ msgid "Print this item"
+#~ msgstr "TennivalС szerkesztИse"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Mutasd mind"
+#~ msgid "Print..."
+#~ msgstr "Nyomtat"
 
-#: ui/evolution-mail.xml.h:46
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "TИmaszerinti levИl lista"
+#~ msgid "Save _As..."
+#~ msgstr "Ment mint..."
 
-#: ui/evolution-mail.xml.h:47
 #, fuzzy
-msgid "VFolder on Se_nder"
-msgstr "VMappa a feladСra"
+#~ msgid "Send _message to contact..."
+#~ msgstr "FIXME: эze_net ennek a szemИlynek"
 
-#: ui/evolution-mail.xml.h:48
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "VMappa a cМmzettekre"
+#~ msgid "_File"
+#~ msgstr "_Mobil"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print..."
+#~ msgstr "Nyomtat"
 
-#: ui/evolution-mail.xml.h:50
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "SzШrУk alkalmazАsa"
+#~ msgid "_Save"
+#~ msgstr "MentИs"
 
-#: ui/evolution-mail.xml.h:51
 #, fuzzy
-msgid "_Configure Folder"
-msgstr "_Mappa beАllМtАsa"
+#~ msgid "About..."
+#~ msgstr "BetШtМpus..."
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "MappАba mАsolАs..."
+#~ msgid "C_lear"
+#~ msgstr "NaptАr"
 
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "LevИl _nyomtatАsa"
+#~ msgid "Clear"
+#~ msgstr "NaptАr"
 
-#: ui/evolution-mail.xml.h:55
 #, fuzzy
-msgid "_Expunge"
-msgstr "_TisztМt"
+#~ msgid "Clear the selection"
+#~ msgstr "A kijelЖlt mappАk megtekintИse"
 
-#: ui/evolution-mail.xml.h:56
 #, fuzzy
-msgid "_Filter on Subject"
-msgstr "SzШrУ a tИmАra"
+#~ msgid "Close this appointment"
+#~ msgstr "A megbeszИlИs tЖrlИse"
 
-#: ui/evolution-mail.xml.h:57
 #, fuzzy
-msgid "_Forward"
-msgstr "TovАbbМt"
+#~ msgid "Copy"
+#~ msgstr "VАllalat"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#, fuzzy
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: _BetШtМpus..."
 
-#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration..."
-msgstr "LevelezИs beАllМtАsa"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: _Feladat"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "LevИltЖrzs"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: KЖvetkezУ"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "MappАba mozgatАs..."
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: _Feladat"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
+#, fuzzy
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: _Elem"
 
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "LevИl _nyomtatАsa"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _Objektum..."
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Ment mint..."
+#~ msgid "Modify the file's properties"
+#~ msgstr "TennivalС lista beАllМtАsai"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "ForrАs"
+#~ msgid "N_ext"
+#~ msgstr "KЖ_vetkezУ"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#, fuzzy
+#~ msgid "Paste"
+#~ msgstr "Lap"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "VisszaАllМt"
+#~ msgid "Previous"
+#~ msgstr "E_lУzУ"
 
-#: ui/evolution-mail.xml.h:68
 #, fuzzy
-msgid "_VFolder on Subject"
-msgstr "VMappa a tИmАra"
+#~ msgid "Print Setup"
+#~ msgstr "Oldal beАllМtАs:"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "VirtuАlis MappАk"
+#~ msgid "Properties"
+#~ msgstr "иbresztУ beАllМtАsok"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Attach"
-msgstr "FАjl csatolАsa"
+#~ msgid "Redo"
+#~ msgstr "RАdiС"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "JelenidУre ugrАs"
+#~ msgid "Replace"
+#~ msgstr "VАlasz"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "LevИl elkЭldИse"
+#~ msgid "Save the current file"
+#~ msgstr "JelenidУre ugrАs"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "VАlassz mappАt"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Csatolj egy fАjlt a levИlhez"
+#~ msgid "Select everything"
+#~ msgstr "VАlassz mappАt"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "BetШtМpus..."
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "FАjl megnyitАs"
+#~ msgid "_Close"
+#~ msgstr "BezАr"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "_Copy"
+#~ msgstr "_VАllalat:"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "_Edit"
+#~ msgstr "Szerkeszt"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "MentИs"
+#~ msgid "_Find..."
+#~ msgstr "KeresИs..."
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Help"
+#~ msgstr "_Otthoni"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "MappАba mozgatАs..."
+#~ msgid "_Paste"
+#~ msgstr "_VezetИknИv:"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print"
+#~ msgstr "Nyomtat"
 
-#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Save the message in a specified folder"
-msgstr ""
-"Nem tudom elkИszМteni a megadott mappАt:\n"
-"%s"
+#~ msgid "_Properties..."
+#~ msgstr "иbresztУ beАllМtАsok"
 
-#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-msgid "Send"
-msgstr "FeladС"
+#~ msgid "_Redo"
+#~ msgstr "RАdiС"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "FeladС"
+#~ msgid "Compose"
+#~ msgstr "BezАr"
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "FeladС"
+#~ msgid "Compose a new message"
+#~ msgstr "LevИl МrАsa"
 
-#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-msgid "Send the mail in HTML format"
-msgstr "A levelet HTML formАtumban kЭldd"
+#~ msgid "Copy message to a new folder"
+#~ msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "TИmaszerinti levИl lista"
+#~ msgid "F_older"
+#~ msgstr "MappАk"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "A levelet HTML formАtumban kЭldd"
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "SzШrУ a feladСn"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "A levИl tЖrlИse"
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "SzШrУ a cМmzettekre"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "FIXME: CsatolАsok me_ntИse..."
+#~ msgid "Forget _Passwords"
+#~ msgstr "JelszС"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "csatolАs"
+#~ msgid "Get Mail"
+#~ msgstr "RИszletek"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "csatolАs"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "A levИl nyomtatАsa"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "A levИl elmentИse mАsik nИven"
+#~ msgid "Hide _Read messages"
+#~ msgstr "Forwarded message - %s"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "A levИl nyomtatАsa"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "Megnyit..."
+#~ msgid "Mail _Filters..."
+#~ msgstr "SzШrУk szerkesztИse"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "LeМrАs:"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "JelЖlИs olvasottnak"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "JelЖlИs nem olvasottnak"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Move"
+#~ msgstr "H"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Move message to a new folder"
+#~ msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "NyomtatАsi elУnИzet"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "LevИl _nyomtatАsa"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr ""
+#, fuzzy
+#~ msgid "Reply to _All"
+#~ msgstr "Mindenkinek"
 
-#: ui/evolution.xml.h:7
 #, fuzzy
-msgid "E_xit"
-msgstr "Szerkeszt"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Mindenkinek"
 
-#: ui/evolution.xml.h:8
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "EvolЗciС naptАr csatorna"
+#~ msgid "Select _All"
+#~ msgstr "VАlassz mappАt"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Mutasd mind"
 
-#: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Nem indult mИg el"
+#~ msgid "Threaded Message list"
+#~ msgstr "TИmaszerinti levИl lista"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
+#, fuzzy
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VMappa a feladСra"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr ""
+#, fuzzy
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VMappa a cМmzettekre"
 
-#: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Nagy ikonok mutatАsa az elemeken"
+#~ msgid "_Apply Filters"
+#~ msgstr "SzШrУk alkalmazАsa"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
+#, fuzzy
+#~ msgid "_Copy to Folder..."
+#~ msgstr "MappАba mАsolАs..."
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
+#, fuzzy
+#~ msgid "_Edit Message"
+#~ msgstr "LevИl _nyomtatАsa"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
+#, fuzzy
+#~ msgid "_Expunge"
+#~ msgstr "_TisztМt"
 
-#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
+#~ msgid "_Filter on Subject"
+#~ msgstr "SzШrУ a tИmАra"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#, fuzzy
+#~ msgid "_Forward"
+#~ msgstr "TovАbbМt"
 
-#: ui/evolution.xml.h:19
 #, fuzzy
-msgid "Using the _Calendar"
-msgstr "NaptАr nyomtatАsa"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "LevelezИs beАllМtАsa"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "LevИltЖrzs"
 
-#: ui/evolution.xml.h:21
 #, fuzzy
-msgid "_About Evolution..."
-msgstr "EvolЗciС"
+#~ msgid "_Move to Folder..."
+#~ msgstr "MappАba mozgatАs..."
 
-#: ui/evolution.xml.h:22
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "MegbeszИlИsek:"
+#~ msgid "_Print Message"
+#~ msgstr "LevИl _nyomtatАsa"
 
-#: ui/evolution.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "NИvjegy szerkesztУ"
+#~ msgid "_Save Message As..."
+#~ msgstr "Ment mint..."
 
-#: ui/evolution.xml.h:26
 #, fuzzy
-msgid "_Folder"
-msgstr "MappАk"
+#~ msgid "_Source"
+#~ msgstr "ForrАs"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "MappАba menj..."
+#~ msgid "_Undelete"
+#~ msgstr "VisszaАllМt"
 
-#: ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Index"
-msgstr "_Beilleszt"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "VMappa a tИmАra"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "VirtuАlis MappАk"
 
-#: ui/evolution.xml.h:32
 #, fuzzy
-msgid "_Settings"
-msgstr "BeАllМtАsok tesztelИse"
+#~ msgid "Attach"
+#~ msgstr "FАjl csatolАsa"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "JelenidУre ugrА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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "LevИl elkЭldИse"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "KМsИrleti"
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Csatolj egy fАjlt a levИlhez"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Foglalt"
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "FАjl megnyitАs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "эzemen kМvЭl"
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "MentИs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nincs informАciС"
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "MappАba mozgatАs..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_MАsok meghМvАsa..."
+#, fuzzy
+#~ msgid "Save the message in a specified folder"
+#~ msgstr ""
+#~ "Nem tudom elkИszМteni a megadott mappАt:\n"
+#~ "%s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_BeАllМtАsok"
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "FeladС"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Csak a _munkaСrАk mutatАsa"
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "FeladС"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "_NagyМtott mutatАsa"
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "FeladС"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Szabad/foglalt frissМtИse"
+#, fuzzy
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "A levelet HTML formАtumban kЭldd"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "TИmaszerinti levИl lista"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Automatikus kiszedИs"
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "A levelet HTML formАtumban kЭldd"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "A levИl tЖrlИse"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Minden ember Иs erУforrАs"
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Minden _ember Иs egy erУforrАs"
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "csatolАs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_A kИrt emberek"
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "A levИl elmentИse mАsik nИven"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "A kИrt emberek Иs egy e_rУforrАs"
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "Megnyit..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "MegbeszИlИs _kezdУdik:"
+#, fuzzy
+#~ msgid "E_xit"
+#~ msgstr "Szerkeszt"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "MegbeszИlИs _vИge:"
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "EvolЗciС naptАr csatorna"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Minden meghМvott"
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Nem indult mИg el"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "HKSCPsV"
+#, fuzzy
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "NaptАr nyomtatАsa"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#, fuzzy
+#~ msgid "_About Evolution..."
+#~ msgstr "EvolЗciС"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Most"
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "MegbeszИlИsek:"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "NИvjegy szerkesztУ"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#, fuzzy
+#~ msgid "_Folder"
+#~ msgstr "MappАk"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "CsoportosМtАs %i"
+#, fuzzy
+#~ msgid "_Go to Folder..."
+#~ msgstr "MappАba menj..."
 
-#~ msgid "categories"
-#~ msgstr "kategСriАk"
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "_Beilleszt"
+
+#, fuzzy
+#~ msgid "_Settings"
+#~ msgstr "BeАllМtАsok tesztelИse"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Az elemek az alАbbi kategСriАkhoz tartoznak:"
@@ -7585,9 +6973,6 @@ msgstr "CsoportosМtАs %i"
 #~ 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"
 
@@ -7642,45 +7027,3 @@ msgstr "CsoportosМtАs %i"
 #, fuzzy
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
-
-#~ 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 9b62358e82..b5249fdc31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.5\n"
-"POT-Creation-Date: 2001-01-16 14:43+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-14 22:19+01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -14,6 +14,180 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Impossibile inizializzare il componente della posta di Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Impossibile inizializzare Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "File di posta UNIX qmail maildir-format"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Messaggio assente"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Scaricamento posta da %s in corso"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Chiudi"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Sposta nella Cartella..."
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Vai al precedente"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Vai al successivo"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configura Cartella"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Impossibile aprire il file %s:\n"
+"%s "
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Errore nella lettura del file di posta: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Nessun errore"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Annullato"
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Impossibile connettersi al server POP su %s"
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nuovo"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Crea un nuovo contatto"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Impossibile inizializzare il componente della posta di Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Impossibile inizializzare Bonobo"
+
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Tessera:"
@@ -298,17 +472,6 @@ msgstr ""
 "\n"
 "Chiave Pubblica: "
 
-#: 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:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1155
-#: calendar/conduits/todo/todo-conduit.c:976 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Impossibile inizializzare Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -439,14 +602,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
 #: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:555
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:556
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
@@ -456,14 +619,6 @@ msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
 #.
-#. * 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 "Cancellare il Contatto?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -473,7 +628,7 @@ msgid "_Add"
 msgstr "_Aggiungi"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -486,13 +641,7 @@ msgstr "Tipi di Telefono"
 msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
-#.
-#. * 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/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -550,7 +699,6 @@ msgid "C_ontacts..."
 msgstr "C_ontatti..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
@@ -567,7 +715,6 @@ msgid "_Address..."
 msgstr "_Indirizzo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "Generale"
 
@@ -612,7 +759,6 @@ msgid "No_tes:"
 msgstr "No_te:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Dettagli"
 
@@ -719,54 +865,6 @@ msgid "Email 3"
 msgstr "Email 3"
 
 #.
-#. * 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 "Indirizzo _2:"
-
-#: po/tmp/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Canada"
-
-#: po/tmp/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Controlla Indirizzo"
-
-#: po/tmp/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "_Stato:"
-
-#: po/tmp/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finlandia"
-
-#: po/tmp/fulladdr.glade.h:11
-msgid "USA"
-msgstr "USA"
-
-#: po/tmp/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Indirizzo:"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_CittЮ:"
-
-#: po/tmp/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Casella Postale:"
-
-#: po/tmp/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Stato/Provincia:"
-
-#: po/tmp/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_ZIP/CAP:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -832,12 +930,7 @@ msgstr "S_uffisso:"
 msgid "As _Minicards"
 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:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Come _Tabella"
 
@@ -954,7 +1047,6 @@ msgid "Remember this password"
 msgstr "Ricorda questa password"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
 msgid "Host:"
 msgstr "Host:"
 
@@ -971,12 +1063,10 @@ msgid "Search Scope:"
 msgstr "Ambito della Ricerca:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Percorso:"
 
@@ -1000,184 +1090,27 @@ msgstr ""
 "Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Nome:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
-
-#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: 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:24
-msgid "Delete"
-msgstr "Elimina"
-
-#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
-msgid "Edit"
-msgstr "Modifica"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Nome"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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 "Trova..."
-
-#: po/tmp/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Destinatari del messaggio:"
-
-#: po/tmp/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Seleziona Nomi"
-
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from:"
-msgstr "Seleziona un nome da:"
-
 #: 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.
-#.
-#: 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"
-
-#: 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:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Nome"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
 msgid "Email"
@@ -1254,178 +1187,6 @@ msgstr ""
 "\n"
 "Fare doppio click qui per creare un nuovo contatto."
 
-#.
-#. * 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 "Moduli bianchi alla fine:"
-
-#: po/tmp/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Corpo"
-
-#: po/tmp/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Inferiore:"
-
-#: po/tmp/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensioni:"
-
-#: po/tmp/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Carattere..."
-
-#: po/tmp/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Caratteri"
-
-#: po/tmp/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Note a piХ di pagina:"
-
-#: po/tmp/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Formato"
-
-#: po/tmp/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Intestazione"
-
-#: po/tmp/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Intestazione/Note a piХ di pagina"
-
-#: po/tmp/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Titoli"
-
-#: po/tmp/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Titolo per ogni lettera"
-
-#: po/tmp/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Altezza:"
-
-#: po/tmp/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Concatenati l'un l'altro"
-
-#: po/tmp/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Includi:"
-
-#: po/tmp/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Orizzontale"
-
-#: po/tmp/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Sinistra:"
-
-#: po/tmp/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Lettere sul bordo"
-
-#: po/tmp/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Margini"
-
-#: po/tmp/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Numero di colonne:"
-
-#: po/tmp/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Opzioni"
-
-#: po/tmp/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Orientazione"
-
-#: po/tmp/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Pagina"
-
-#: po/tmp/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Impostazione pagina:"
-
-#: po/tmp/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Carta"
-
-#: po/tmp/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Alimentazione della carta:"
-
-#: po/tmp/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Verticale"
-
-#: po/tmp/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Anteprima:"
-
-#: po/tmp/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Stampa usando ombreggiatura grigia"
-
-#: po/tmp/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Inverti le pagine pari"
-
-#: po/tmp/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Destra:"
-
-#: po/tmp/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sezioni:"
-
-#: po/tmp/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "Ombreggiatura"
-
-#: po/tmp/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Dimensione:"
-
-#: po/tmp/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Inizia su una nuova pagina"
-
-#: po/tmp/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Nome dello stile:"
-
-#: po/tmp/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Superiore:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
-msgid "Type:"
-msgstr "Tipo:"
-
-#: po/tmp/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Larghezza:"
-
-#: po/tmp/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conduit per il Calendario di Evolution"
@@ -1435,13 +1196,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:690
-#: calendar/conduits/todo/todo-conduit.c:511
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:792
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
@@ -1453,8 +1214,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:610
-#: calendar/conduits/todo/todo-conduit.c:613
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
@@ -1463,7 +1224,7 @@ msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 msgid "Reminder of your appointment at "
 msgstr "Promemoria dell'appuntamento alle"
 
-#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Suoneria"
 
@@ -1473,19 +1234,19 @@ msgstr "Suoneria"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "File non trovato"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Apri calendario"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Salva calendario"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1493,7 +1254,7 @@ msgstr ""
 "ORBit e di OAF"
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:328
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1501,57 +1262,57 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:336 calendar/gui/calendar-model.c:765
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:370 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:467
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:469
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:541
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:770
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1563,7 +1324,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1571,27 +1332,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:889
+#: calendar/gui/calendar-model.c:893
 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:892
+#: calendar/gui/calendar-model.c:896
 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:896
+#: calendar/gui/calendar-model.c:900
 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:899
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1019
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1601,47 +1362,43 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1059
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1099
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritЮ dev'essere compresa tra 1 e 9, inclusi"
 
-#: calendar/gui/calendar-summary.c:93
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:299
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Errore nel caricare il calendario</b>"
 
-#: calendar/gui/calendar-summary.c:304
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>Errore nel caricare il calendario:<br> Calendario in uso"
-
-#: calendar/gui/calendar-summary.c:310
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
 
-#: calendar/gui/calendar-summary.c:476
+#: calendar/gui/calendar-summary.c:484
 msgid "Display"
 msgstr "Visualizza"
 
-#: calendar/gui/calendar-summary.c:481
+#: calendar/gui/calendar-summary.c:489
 msgid "Show appointments"
 msgstr "Mostra appuntamenti"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:497
 msgid "Show tasks"
 msgstr "Mostra obiettivi"
 
-#: calendar/gui/calendar-summary.c:581
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "Caricamento del Calendario"
 
@@ -1649,584 +1406,243 @@ msgstr "Caricamento del Calendario"
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerЮ"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Avviso alle %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Indice non disponibile."
 
-#.
-#. * 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 "Chiudi"
-
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Modifica appuntamenti"
-
-#: po/tmp/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Suoneria (minuti)"
-
-#.
-#. * 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 minuti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minuti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 ore (am/pm)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minuti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 ore"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minuti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minuti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Interruzione avviso sonoro dopo"
-
-#: po/tmp/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Avviso Sonoro"
-
-#: po/tmp/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "Emette un suono quondo appare la finestra di avviso"
-
-#: po/tmp/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Calendario"
-
-#: po/tmp/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Preferenze del Calendario"
-
-#: po/tmp/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Colori"
-
-#: po/tmp/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Comprimi i fine settimana"
-
-#: po/tmp/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Opzioni del navigatore delle date"
-
-#: po/tmp/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Predefinito"
-
-#: po/tmp/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Visualizza opzioni"
-
-#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Scadenza"
-
-#: po/tmp/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Attiva la suoneria per "
-
-#: po/tmp/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Fine della giornata: "
-
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Primo giorno della settimana:"
-
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
-msgid "Friday"
-msgstr "VenerdЛ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Evidenzia"
-
-#: po/tmp/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Scadenze per oggi"
-
-#: po/tmp/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Scadenze per oggi:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr "Non ancora scaduti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr "Non ancora scaduti:"
-
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
-msgid "Monday"
-msgstr "LunedЛ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "Compiti scaduti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Compiti scaduti:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Prendi un colore"
-
-#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "PrioritЮ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Ricordami tutti gli appuntamenti"
-
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr "Promemoria"
-
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "Sab"
-
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
-msgid "Saturday"
-msgstr "Sabato"
-
-#: po/tmp/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Mostra"
-
-#: po/tmp/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Mostra i termini dell'appuntamento"
-
-#: po/tmp/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Mostra i numeri delle settimane"
-
-#: po/tmp/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Inizio della giornata:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "Domenica"
-
-#: po/tmp/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "TaskPad"
-
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
-msgid "Thu"
-msgstr "Gio"
-
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
-msgid "Thursday"
-msgstr "GiovedЛ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "Cronometra fino al termine"
-
-#: po/tmp/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Suddivisione del tempo:"
-
-#: po/tmp/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Formato del tempo:"
-
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "MartedЛ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Avviso visivo"
-
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "MercoledЛ"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Settimana lavorativa"
-
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minuti prima che inizino."
-
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "secondi."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sei sicuro di voler cancellare questo appuntamento senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sei sicuro di voler cancellare quest'obiettivo senxa nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sei sicuro di voler cancellare questa voce dell'agenda senza nome?"
 
-#.
-#. * 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:"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "C_lassificazione"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Annullato"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Completato"
-
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Completato in data:"
-
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Altezza"
-
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "In corso"
-
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Basso"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nessuno "
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normale"
-
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Da cominciare"
-
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "_Riassunto"
-
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Data di _inizio:"
-
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Obiettivo"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "Undefined"
-msgstr ""
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Contacts..."
-msgstr "_Contatti..."
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Due Date:"
-msgstr "Sca_denza:"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Priority:"
-msgstr "_PrioritЮ:"
-
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "_Status:"
-msgstr "_Status:"
-
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Modifica Obiettivo"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Niente indice"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Obiettivo - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-calendar-table.c:154
 #, fuzzy
 msgid "Categories"
 msgstr ""
 "\n"
 "Categorie:"
 
-#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:155
 msgid "Classification"
 msgstr "Classificazione"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completato"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "End Date"
 msgstr "Ora di _fine:"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Start Date"
 msgstr "Data di _inizio:"
 
 #: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Scadenza"
+
+#: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Precent complete"
 msgstr "Segna l'obiettivo come raggiunto"
 
 #: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "PrioritЮ"
+
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
 msgid "Summary"
 msgstr "_Riassunto"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Transparency"
 msgstr "Trasparente"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Alarms"
 msgstr "Avviso Sonoro"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Apri..."
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Apri ..."
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Segna l'obiettivo come raggiunto"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Elimina"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 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:1213
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1227
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1240
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
-#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
-#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nuovo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Modifica questo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Elimina questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Rendi rimandabile questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Elimina tutte le ricorrenze"
 
-#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
-#: calendar/gui/e-tasks.c:608
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:162
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Categorie:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare l'obiettivo in `%s'"
 
-#: calendar/gui/e-tasks.c:345
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "Impossibile creare un file per l'obiettivo in `%s'"
-
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "IL metodo richiesto per caricare `%s' non Х supportato"
@@ -2234,273 +1650,110 @@ msgstr "IL metodo richiesto per caricare `%s' non Х supportato"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "_Eventi della giornata"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Appuntamenti di Base:"
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr "Ricorrenza personalizzata"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Giorni"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Ogni"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Eccezioni"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Ore"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "_Scrivi a:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minuti"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "Modifica"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr "Nessuna Ricorrenza"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr "Anteprima"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Pri_vato"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "Pub_blico"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr "Ricorrenza"
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr "Regole di ricorrenza"
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Semplice ricorrenza"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "_Indice:"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Tempo"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "_Audio"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "_Confidenziale"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Contatti"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "_Visualizza"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Ora di _fine:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "_Posta"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "_Programma"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "Esegui p_rogramma"
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "_Ora di inizio:"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "Data di _inizio:"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
-msgstr "giorno(i)"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "per"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Modifica Appuntamenti"
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "sempre"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "il"
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "giorno"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr "mese(i)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "LunedЛ"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr "fino a"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "MartedЛ"
 
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr "Settimana(e)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "MercoledЛ"
 
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr "anno(i)"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "GiovedЛ"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Modifica Appuntamenti"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "VenerdЛ"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "il"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Sabato"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "giorno"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Domenica"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "il"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr " "
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "ricorrenze"
 
-#: calendar/gui/event-editor.c:838
+#: 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:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:709
+#: calendar/gui/gnome-cal.c:696
 #, fuzzy, c-format
-msgid "Could not load the folder in `%s'"
+msgid "Could not open the folder in `%s'"
 msgstr "Impossibile caricare il calendario in `%s'"
 
-#: calendar/gui/gnome-cal.c:720
+#: calendar/gui/gnome-cal.c:707
 #, fuzzy, c-format
-msgid "Could not create a folder in `%s'"
-msgstr "Impossibile creare un calendario in `%s'"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-msgid "April"
-msgstr "Aprile"
-
-#: po/tmp/goto-dialog.glade.h:7
-msgid "August"
-msgstr "Agosto"
-
-#: po/tmp/goto-dialog.glade.h:8
-msgid "December"
-msgstr "Dicembre"
-
-#: po/tmp/goto-dialog.glade.h:9
-msgid "February"
-msgstr "Febbraio"
-
-#: po/tmp/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr "Vai alla data"
-
-#: po/tmp/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr "Vai a oggi"
-
-#: po/tmp/goto-dialog.glade.h:12
-msgid "January"
-msgstr "Gennaio"
+msgid "The method required to open `%s' is not supported"
+msgstr "IL metodo richiesto per caricare `%s' non Х supportato"
 
-#: po/tmp/goto-dialog.glade.h:13
-msgid "July"
-msgstr "Luglio"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
 
-#: po/tmp/goto-dialog.glade.h:14
-msgid "June"
-msgstr "Giugno"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
 
-#: po/tmp/goto-dialog.glade.h:15
-msgid "March"
-msgstr "Marzo"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
 
-#: po/tmp/goto-dialog.glade.h:16
-msgid "May"
-msgstr "Maggio"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mer"
 
-#: po/tmp/goto-dialog.glade.h:17
-msgid "November"
-msgstr "Novembre"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Gio"
 
-#: po/tmp/goto-dialog.glade.h:18
-msgid "October"
-msgstr "Ottobre"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
 
-#: po/tmp/goto-dialog.glade.h:19
-msgid "September"
-msgstr "Settembre"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sab"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -2694,7 +1947,7 @@ msgstr "Anno corrente (%Y)"
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
@@ -2804,23 +2057,23 @@ msgstr "%s server %s"
 msgid "%s service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/camel-remote-store.c:317
+#: camel/camel-remote-store.c:318
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Annullato"
 
-#: camel/camel-remote-store.c:320 camel/camel-remote-store.c:333
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:425 camel/camel-remote-store.c:487
-#: camel/camel-remote-store.c:555
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
@@ -2851,12 +2104,12 @@ msgstr "NOn c'Х l'host %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporaneamente incapace di cercare il nome dell'host %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2921,12 +2174,13 @@ msgstr "La risposta del server IMAP non contiene informazione %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:627
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -3442,7 +2696,6 @@ msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3518,7 +2771,6 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:295
-#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3579,51 +2831,51 @@ msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "La richiesta di RCPT TO: %s: posta non inviata"
 
 #: camel/providers/smtp/camel-smtp-transport.c:574
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Errore nella risposta di RCPT TO: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:621
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Errore nella risposta di DATA: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
-#: camel/providers/smtp/camel-smtp-transport.c:654
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Errore nella risposta di DATA: terminazione del messaggio: %s posta non "
 "inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:694
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Errore nella risposta di QUIT: %s: non fatale<"
@@ -3666,12 +2918,11 @@ msgid "attachment"
 msgstr "allegato"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -3687,22 +2938,6 @@ msgstr "Aggiungere allegato..."
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
-#.
-#. * 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 "ProprietЮ dell'allegato"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nome del file:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
 #: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
 #: mail/mail-format.c:624
 msgid "From:"
@@ -3762,38 +2997,38 @@ msgstr ""
 "Impossibile aprire il file firma: %s\n"
 "%s "
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Salvataggio del messaggio in corso..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Salva i cambiamenti al messaggio..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Errore nel salvataggio del componimento in 'Bozze': %s"
 
-#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:760
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3803,27 +3038,27 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Il file noon esiste."
 
-#: composer/e-msg-composer.c:921
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Non Х un file regolare."
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "File esistente ma illeggibile."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
 
-#: composer/e-msg-composer.c:963
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3831,26 +3066,22 @@ msgstr ""
 "Questo file Х molto grande (piЫ di 100K).\n"
 "Inserire ugualmente?"
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Si Х verificato un errore durante le lettura del file."
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1441
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: composer/evolution-composer.c:345
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "_Cerca"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "anno"
@@ -3983,7 +3214,7 @@ msgstr "In entrata"
 msgid "outgoing"
 msgstr "In uscita"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
 
@@ -4085,30 +3316,6 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Leggi"
 
-#: po/tmp/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Modifica VFolder"
-
-#: po/tmp/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Regole dei Filtri"
-
-#: po/tmp/filter.glade.h:12
-msgid "Incoming"
-msgstr "In entrata:"
-
-#: po/tmp/filter.glade.h:13
-msgid "Outgoing"
-msgstr "In uscita:"
-
-#: po/tmp/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Cartelle Virtuali"
-
-#: po/tmp/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Sorgenti delle cartelle virtuali"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -4295,11 +3502,11 @@ msgstr "Aggiungi regola per Cartella Virtuale"
 msgid "Edit VFolder Rule"
 msgstr "Modifica le regole per VFolder"
 
-#: mail/component-factory.c:282
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:318
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -4356,17 +3563,19 @@ msgstr "Filtro sui Destinatari:"
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Apri"
 
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Modifica"
+
 #: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Salva con nome..."
 
 #: mail/folder-browser.c:661 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:31
 msgid "Print"
 msgstr "Stampa"
 
@@ -4375,16 +3584,14 @@ msgid "Reply to Sender"
 msgstr "Rispondi al Mittente"
 
 #: mail/folder-browser.c:664 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
 #: mail/folder-browser.c:665 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Inoltra"
 
-#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Vai avanti"
 
@@ -4423,45 +3630,33 @@ msgstr "Crea Regola dal Messaggio"
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-msgid "Current store format:"
-msgstr "Formato corrente di archiviazione:"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr "Formato della Mailbox"
-
-#: po/tmp/local-config.glade.h:8
-msgid "New store format:"
-msgstr "Nuovo formato di archiviazione:"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr "Nota: durante la conversione tra formati mailbox, un errore\n"
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr "maildir"
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr "mbox"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Nessuno "
 
-#: po/tmp/local-config.glade.h:14
-msgid "mh"
-msgstr "mh"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Predefinito"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:341
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Gestione degli Account di Evolution"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:605
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
@@ -4485,7 +3680,7 @@ msgstr "Mail da %s"
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4497,7 +3692,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4505,7 +3700,7 @@ msgstr ""
 "х necessario configurare un' identitЮ\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4513,15 +3708,15 @@ msgstr ""
 "х necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Non Х stato impostato un sistema di trasporto per la posta"
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Casella di posta in uscita non configurata"
 
-#: mail/mail-callbacks.c:258
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4529,30 +3724,30 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:345
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "х necessario configurare un' identitЮ\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "х necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:567
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-callbacks.c:648
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:785
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4560,11 +3755,11 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:818 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:822 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4572,15 +3767,15 @@ msgstr ""
 "Esiste giЮ un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: mail/mail-callbacks.c:867
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:869
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:953
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4589,242 +3784,22 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1002
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:1049
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
-msgid "Account"
-msgstr "Account"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Informazioni sull'Account"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "Gestione degli Account"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "ProprietЮ dell'Account"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Tipo di Autenticazione:"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Congratulazioni, la configurazione della posta Х stata completata.\n"
-
-#: po/tmp/mail-config.glade.h:22
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:23
-msgid "Default"
-msgstr "Predefinito"
-
-#: po/tmp/mail-config.glade.h:25
-msgid "Done"
-msgstr "Completato"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "E-Mail Address:"
-msgstr "Indirizzo Email:"
-
-#: po/tmp/mail-config.glade.h:28
-msgid "Email Address:"
-msgstr "Indirizzo Email:"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "Configurazione della Posta di Evolution"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Full Name:"
-msgstr "Nome e cognome:"
-
-#: po/tmp/mail-config.glade.h:33
-msgid "Hostname:"
-msgstr "Hostname:"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Identity"
-msgstr "IdentitЮ"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Incoming Mail Server"
-msgstr "Server della Posta in entrata"
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Keep mail on server"
-msgstr "Non cancellare i messaggi dal server"
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Mail"
-msgstr "Posta"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail Account"
-msgstr "Account di Posta"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Configuration"
-msgstr "Configurazione della Posta"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration Druid"
-msgstr "Configurazione guidata della Posta"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Make this my default account"
-msgstr "Imposta come mio account predefinito"
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Miscellaneous"
-msgstr "Varie"
-
-#: po/tmp/mail-config.glade.h:45
-msgid "News"
-msgstr "News"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "Optional"
-msgstr "Opzionale"
-
-#: po/tmp/mail-config.glade.h:48
-msgid "Organization:"
-msgstr "Organizzazione:"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Server della Posta in Uscita"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Password:"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Plain Text"
-msgstr "Testo semplice"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Receiving Email"
-msgstr "Ricezione Email"
-
-#: po/tmp/mail-config.glade.h:54
-msgid "Remember my password"
-msgstr "Ricorda la mia password"
-
-#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
-msgid "Reply-To:"
-msgstr "Rispondi-a:"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Required"
-msgstr "Richiesto"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config.glade.h:58
-msgid "Save password"
-msgstr "Salva password"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Select signature file"
-msgstr "Scegliere il file con la firma"
-
-#: po/tmp/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Invio Email"
-
-#: po/tmp/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Configurazione del Server"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Tipo di Server:"
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Il Server richiede l'autenticazione"
-
-#: po/tmp/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Server"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "File con la firma:"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Firma:"
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Sorgenti"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Questo server richiede una connessione sicura (SSL)"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "Type"
-msgstr "Tipo"
-
-#: po/tmp/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Inserire il nome con il quale si desidera riferirsi a questi server. Per "
-"esempio: \"Lavoro\" o \"Casa\"."
-
-#: po/tmp/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Informazioni Utente"
-
-#: po/tmp/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Username:"
-
-#: po/tmp/mail-config.glade.h:75
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Configurazione guidata della Posta, benvenuti.\n"
-
-#: mail/mail-config-druid.c:346
+#: mail/mail-config-druid.c:363
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
 "You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:612
+#: mail/mail-config-druid.c:629
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -4832,7 +3807,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:889
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr "Guida agli Account di Evolution"
 
@@ -4890,6 +3865,10 @@ msgstr "Nascondi"
 msgid "%s attachment"
 msgstr "%s allegato"
 
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Rispondi-a:"
+
 #: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
@@ -5017,143 +3996,143 @@ msgstr ""
 msgid "Working"
 msgstr "Sto lavorando"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Scaricamento posta da %s in corso"
 
-#: mail/mail-ops.c:92
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Scarica la posta da %s"
 
-#: mail/mail-ops.c:342
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non c'Х nuova posta su %s."
 
-#: mail/mail-ops.c:413
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtraggio della posta su richiesta"
 
-#: mail/mail-ops.c:415
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtra la posta su richiesta"
 
-#: mail/mail-ops.c:546
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Invio della coda in corso"
 
-#: mail/mail-ops.c:666
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Invia la coda"
 
-#: mail/mail-ops.c:807 mail/mail-ops.c:814
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Accoda \"%s\""
 
-#: mail/mail-ops.c:811 mail/mail-ops.c:817
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Accoda un messaggio senza oggetto"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Spostamento messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copia messaggi da \"%s\" a \"%s\" in corso"
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Sposta messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia i messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:961
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1036
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1102 mail/subscribe-dialog.c:348
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Nessuna descrizione)"
 
-#: mail/mail-ops.c:1167
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1208 mail/mail-ops.c:1277
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-ops.c:1339
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Sincronizzazione cartella"
 
-#: mail/mail-ops.c:1389
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Scaricamento messaggi"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1527
 #, 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:1663
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Caricamento Cartella %s per %s"
 
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Carica Cartella %s per %s"
 
-#: mail/mail-ops.c:1831
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Salvataggio messaggi"
 
-#: mail/mail-ops.c:1910
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5162,12 +4141,12 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1937
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5290,27 +4269,27 @@ msgstr "Nuova Cartella Virtuale"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Rispondi all'autore di questo messaggio"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Rispondi a tutti i destinatari di questo messaggio"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Inoltra questo messaggio"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Stampa il messaggio selezionato"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Elimina questo messaggio"
 
@@ -5399,80 +4378,81 @@ msgstr "A:"
 msgid "Size"
 msgstr "Dimensione:"
 
-#: mail/openpgp-utils.c:76
-#, c-format
-msgid "Please enter your %s passphrase%s%s"
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
 msgstr "Digitare la %s passphrase%s%s"
 
-#: mail/openpgp-utils.c:77
-msgid " for "
-msgstr " per"
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Digitare la %s passphrase%s%s"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
 msgid "No GPG/PGP program available."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
 msgid "No password provided."
 msgstr "Non Х stata fornita alcuna password."
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
 msgid "No recipients specified"
 msgstr "Nessun destinatario specificato"
 
-#: mail/openpgp-utils.c:1061
+#: mail/openpgp-utils.c:1065
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Impossibile creare file temporaneo: %s  "
 
-#: mail/subscribe-dialog.c:63 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Cartelle"
 
-#: mail/subscribe-dialog.c:64
+#: mail/subscribe-dialog.c:63
 #, fuzzy
 msgid "Store"
 msgstr "Punteggio"
 
-#: mail/subscribe-dialog.c:146
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Visualizza le cartelle a partire da:"
 
-#: mail/subscribe-dialog.c:179
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:182
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:298
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Sottoscrivi cartella \"%s\""
 
-#: mail/subscribe-dialog.c:301
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Annulla sottoscrizione cartella \"%s\""
@@ -5619,9 +4599,14 @@ msgstr "(Nessuna cartella mostrata)"
 msgid "Folders"
 msgstr "Cartelle"
 
-#: shell/e-shell-view.c:1093
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5717,13 +4702,11 @@ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:36
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Visualizza"
 
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
@@ -5835,1282 +4818,1873 @@ msgstr "Disabilita."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Crea un nuovo contatto"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Nuovo appuntamento..."
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Cancella un contatto"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Trova"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "Invia Messaggio"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Trova un contatto"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nuovo"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Stampa contatti"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
-msgid "Stop"
-msgstr "Stop"
+#: ui/evolution-contact-editor.xml:14
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "Voce nell'agenda - %s"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Arresta caricamento"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Visualizza Tutto"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Visualizza tutti i contatti"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "Configurazione della _Rubrica..."
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Stampa _Contatti..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Ceca Contatti"
+#: ui/evolution-contact-editor.xml:35
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Salva Allegati"
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "S_trumenti"
+#: ui/evolution-contact-editor.xml:38
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "_Sposta nella Cartella"
 
-#.
-#. * 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 Giorni"
+#: ui/evolution-contact-editor.xml:39
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Copia nella Cartella"
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Cambia preferenze"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Impostazione pagina:"
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Ca_lendario"
+#: ui/evolution-contact-editor.xml:42
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "Anteprima di stampa"
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Preferenze del Calendario..."
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "_Filtri Posta..."
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Crea un nuovo appuntamento"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Segna come Non Letto"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Crea un nuovo calendario"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Oggetto"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Giorno"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Torna indietro nel tempo"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Vai avanti nel tempo"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Vai al"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Vai ad una data specifica"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "Inoltra"
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Vai al presente"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mese"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Precedente"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Successivo"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Apri un calendario"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Barra degli S_trumenti"
+
+#: ui/evolution-contact-editor.xml:109
+#, fuzzy
+msgid "FIXME: _File..."
+msgstr "_Filtri Posta..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Prec"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Stampa questo calendario"
+#: ui/evolution-contact-editor.xml:116
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Carattere..."
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Salva calendario con altro nome"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Mostra 1 giorno"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Mostra 1 mese"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Mostra 1 settimana"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Mostra la settimana lavorativa"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Oggi"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Settimana"
-
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
-msgid "_New"
-msgstr "_Nuovo"
-
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Apri calendario"
-
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Stampa questo calendario"
-
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "_Salva con nome..."
-
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Elimina quest'oggetto"
-
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Elimina..."
-
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Aiuto"
-
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Stampa _Busta..."
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Stampa questo articolo"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Stampa..."
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Salva _come..."
-
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Salva ed Esci"
-
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Salva il contatto e chiudi la finestra di dialogo"
-
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "_Invia contatto a altri..."
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Vedere aiuto in linea"
-
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Schede"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Nuovo appuntamento..."
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
 msgstr "Invia un _messaggio al contatto..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
-msgid "_File"
-msgstr "_File"
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "S_tampa..."
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Filtri Posta..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Save"
-msgstr "_Salva"
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+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 "Informazioni su questa applicazione"
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "Voce nell'agenda - %s"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Copia nella Cartella"
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "Invia Messaggio"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "Invia Messaggio"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Inoltra"
+
+#: ui/evolution-contact-editor.xml:157
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Inoltra"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Inserisci"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Informazioni su..."
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "S_trumenti"
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "Azio_ni"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "_Annulla"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Precedente"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "_Taglia"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Vai al precedente"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Annulla"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "_Filtri Posta..."
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Annulla la Selezione"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Vai al successivo"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Chiudi questo appuntamento"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copia"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativo"
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Copia selezionato"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Occupato"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Taglia"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Assente"
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Taglia selezionato"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Nessuna informazione"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "Dump XML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Invita altri..."
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Fa un Dump della descrizione UI Xml"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opzioni"
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Address _Book..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Mostra s_olo le ore lavorative"
 
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Vista _allargata"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "A_ggiorna libero/Occupato"
 
-#: po/tmp/evolution-event-editor.xml.h:26
-#, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Copia nella Cartella"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_Autopick"
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Tutto il Personale e le Risorse"
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Tutto il _Personale e una Risorsa"
 
-#: po/tmp/evolution-event-editor.xml.h:31
-#, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Inoltra"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Personale _Richiesto"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Personale Richiesto e _una risorsa"
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "_Inizio appuntamento ore:"
 
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "T_ermine dell' appuntamento ore:"
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Tutti i partecipanti"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMGVSD"
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: po/tmp/evolution-event-editor.xml.h:38
-#, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "Anteprima di stampa"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Adesso"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Oggi"
 
-#: po/tmp/evolution-event-editor.xml.h:41
-#, fuzzy
-msgid "FIXME: Rec_urrence..."
-msgstr "Ricorrenza"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: po/tmp/evolution-event-editor.xml.h:43
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Salva Allegati"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "_Cerca"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppo %i"
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Delete Contact?"
+#~ msgstr "Cancellare il Contatto?"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr ""
+#~ msgid "Address _2:"
+#~ msgstr "Indirizzo _2:"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#~ msgid "Canada"
+#~ msgstr "Canada"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-#, fuzzy
-msgid "FIXME: _File..."
-msgstr "_Filtri Posta..."
+#~ msgid "Check Address"
+#~ msgstr "Controlla Indirizzo"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-#, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Carattere..."
+#~ msgid "Countr_y:"
+#~ msgstr "_Stato:"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
+#~ msgid "Finland"
+#~ msgstr "Finlandia"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "Voce nell'agenda - %s"
+#~ msgid "_Address:"
+#~ msgstr "_Indirizzo:"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#~ msgid "_City:"
+#~ msgstr "_CittЮ:"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "Invia Messaggio"
+#~ msgid "_PO Box:"
+#~ msgstr "_Casella Postale:"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "_State/Province:"
+#~ msgstr "_Stato/Provincia:"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-#, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "_Sposta nella Cartella"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_ZIP/CAP:"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Nuovo appuntamento..."
+#~ msgid "Addressbook Sources"
+#~ msgstr "Sorgenti della Rubrica"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "Trova..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#~ msgid "Message Recipients"
+#~ msgstr "Destinatari del messaggio:"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr ""
+#~ msgid "Select Names"
+#~ msgstr "Seleziona Nomi"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "Select name from:"
+#~ msgstr "Seleziona un nome da:"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormato"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Cerca ancora"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Trova _Ancora"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Vai al successivo"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Vai al precedente"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Modifica le proprietЮ del file"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "S_uccessivo"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Incolla"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Incolla agli appunti"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Precedente"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Precedente"
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "_Impostazioni Stampa..."
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Impostazione pagina"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "ProprietЮ"
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Rifai"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Rifai l'azione annullata"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Sostituisci"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Sostituisci una stringa"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Salva"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file"
-msgstr "Salva il file corrente"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Pianifica una Riunione"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "Pianifica una _Riunione"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "Pianifica un tipo di riunione"
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Cerca ancora la stessa stringa"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Cerca una stringa"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Seleziona Tutto"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Moduli bianchi alla fine:"
 
-#: po/tmp/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Seleziona ogni cosa"
+#~ msgid "Body"
+#~ msgstr "Corpo"
 
-#: po/tmp/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Imposta i parametri della pagina per la stampante corrente"
+#~ msgid "Bottom:"
+#~ msgstr "Inferiore:"
 
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Annulla"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensioni:"
 
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#~ msgid "Font..."
+#~ msgstr "Carattere..."
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_About..."
-msgstr "_Informazioni su"
+#~ msgid "Fonts"
+#~ msgstr "Caratteri"
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Close"
-msgstr "_Chiudi"
+#~ msgid "Footer:"
+#~ msgstr "Note a piХ di pagina:"
 
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Copia"
+#~ msgid "Format"
+#~ msgstr "Formato"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:41
-msgid "_Debug"
-msgstr "_Debug"
+#~ msgid "Header"
+#~ msgstr "Intestazione"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
-msgid "_Edit"
-msgstr "_Modifica"
+#~ msgid "Header/Footer"
+#~ msgstr "Intestazione/Note a piХ di pagina"
 
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Trova..."
+#~ msgid "Headings"
+#~ msgstr "Titoli"
 
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Schede"
+#~ msgid "Headings for each letter"
+#~ msgstr "Titolo per ogni lettera"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
-msgid "_Help"
-msgstr "_Aiuto"
+#~ msgid "Height:"
+#~ msgstr "Altezza:"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Inserisci"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Concatenati l'un l'altro"
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Oggetto"
+#~ msgid "Include:"
+#~ msgstr "Includi:"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Incolla"
+#~ msgid "Landscape"
+#~ msgstr "Orizzontale"
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "S_tampa"
+#~ msgid "Left:"
+#~ msgstr "Sinistra:"
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_ProprietЮ"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Lettere sul bordo"
 
-#: po/tmp/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "_Rifai"
+#~ msgid "Margins"
+#~ msgstr "Margini"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Sostituisci"
+#~ msgid "Number of columns:"
+#~ msgstr "Numero di colonne:"
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "Barra degli S_trumenti"
+#~ msgid "Options"
+#~ msgstr "Opzioni"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Annulla"
+#~ msgid "Orientation"
+#~ msgstr "Orientazione"
 
-#.
-#. * 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 "Scrivi"
+#~ msgid "Page"
+#~ msgstr "Pagina"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Scrivi un nuovo messaggio"
+#~ msgid "Paper"
+#~ msgstr "Carta"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Copia messaggio in una nuova cartella"
+#~ msgid "Paper source:"
+#~ msgstr "Alimentazione della carta:"
 
-#: po/tmp/evolution-mail.xml.h:10
-#, fuzzy
-msgid "Create Rule"
-msgstr "Crea Regola dal Messaggio"
+#~ msgid "Portrait"
+#~ msgstr "Verticale"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "C_artelle"
+#~ msgid "Preview:"
+#~ msgstr "Anteprima:"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltra sul Mittente"
+#~ msgid "Print using gray shading"
+#~ msgstr "Stampa usando ombreggiatura grigia"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtro sui _Destinatari"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Inverti le pagine pari"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Dimantica _Password"
+#~ msgid "Right:"
+#~ msgstr "Destra:"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Ricevi Posta"
+#~ msgid "Sections:"
+#~ msgstr "Sezioni:"
 
-#: po/tmp/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "Nascondi i messaggi _Selezionati"
+#~ msgid "Shading"
+#~ msgstr "Ombreggiatura"
 
-#: po/tmp/evolution-mail.xml.h:22
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Nascondi i messaggi _Cancellati"
+#~ msgid "Size:"
+#~ msgstr "Dimensione:"
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Nascondi i messaggi _Letti"
+#~ msgid "Start on a new page"
+#~ msgstr "Inizia su una nuova pagina"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Mail _Filters..."
-msgstr "_Filtri Posta..."
+#~ msgid "Style name:"
+#~ msgstr "Nome dello stile:"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Manage Subscriptions..."
-msgstr "Gestione sottoscrizioni..."
+#~ msgid "Top:"
+#~ msgstr "Superiore:"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Mar_k As Read"
-msgstr "S_egna come Letto"
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mark As U_nread"
-msgstr "Segna come _Non Letto"
+#~ msgid "Width:"
+#~ msgstr "Larghezza:"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Move"
-msgstr "Sposta"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move message to a new folder"
-msgstr "Sposta il messaggio in una nuova cartella"
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>Errore nel caricare il calendario:<br> Calendario in uso"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Previews the message to be printed"
-msgstr "Anteprime del messaggio da stampare"
+#~ msgid "Edit appointment"
+#~ msgstr "Modifica appuntamenti"
 
-#: po/tmp/evolution-mail.xml.h:32
-msgid "Print Preview of message..."
-msgstr "Anteprima di stampa del messaggio..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Suoneria (minuti)"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print message to the printer"
-msgstr "Stampa messaggio con la stampante"
+#~ msgid "05 minutes"
+#~ msgstr "05 minuti"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message..."
-msgstr "Stampa messaggio..."
+#~ msgid "10 minutes"
+#~ msgstr "10 minuti"
 
-#: po/tmp/evolution-mail.xml.h:38
-msgid "Reply to _All"
-msgstr "Rispondi a _Tutti"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 ore (am/pm)"
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _Sender"
-msgstr "Rispondi al _Mittente"
+#~ msgid "15 minutes"
+#~ msgstr "15 minuti"
 
-#: po/tmp/evolution-mail.xml.h:42
-#, fuzzy
-msgid "S_ource"
-msgstr "Sorgente"
+#~ msgid "24 hour"
+#~ msgstr "24 ore"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Seleziona _Tutto"
+#~ msgid "30 minutes"
+#~ msgstr "30 minuti"
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
+#~ msgid "60 minutes"
+#~ msgstr "60 minuti"
 
-#: po/tmp/evolution-mail.xml.h:45
-#, fuzzy
-msgid "Show _All Messages"
-msgstr "Mostra _Tutti i messaggi"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Interruzione avviso sonoro dopo"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Avviso Sonoro"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Emette un suono quondo appare la finestra di avviso"
+
+#~ msgid "Calendar"
+#~ msgstr "Calendario"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferenze del Calendario"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Comprimi i fine settimana"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Opzioni del navigatore delle date"
+
+#~ msgid "Defaults"
+#~ msgstr "Predefinito"
+
+#~ msgid "Display options"
+#~ msgstr "Visualizza opzioni"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Attiva la suoneria per "
+
+#~ msgid "End of day:"
+#~ msgstr "Fine della giornata: "
+
+#~ msgid "First day of week:"
+#~ msgstr "Primo giorno della settimana:"
+
+#~ msgid "Highlight"
+#~ msgstr "Evidenzia"
+
+#~ msgid "Items Due Today"
+#~ msgstr "Scadenze per oggi"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Scadenze per oggi:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Non ancora scaduti"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Non ancora scaduti:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "Compiti scaduti"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Compiti scaduti:"
+
+#~ msgid "Pick a color"
+#~ msgstr "Prendi un colore"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Ricordami tutti gli appuntamenti"
+
+#~ msgid "Reminders"
+#~ msgstr "Promemoria"
+
+#~ msgid "Show"
+#~ msgstr "Mostra"
+
+#~ msgid "Show appointment end times"
+#~ msgstr "Mostra i termini dell'appuntamento"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Mostra i numeri delle settimane"
+
+#~ msgid "Start of day:"
+#~ msgstr "Inizio della giornata:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Cronometra fino al termine"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Suddivisione del tempo:"
+
+#~ msgid "Time format:"
+#~ msgstr "Formato del tempo:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Avviso visivo"
+
+#~ msgid "Work week"
+#~ msgstr "Settimana lavorativa"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuti prima che inizino."
+
+#~ msgid "seconds."
+#~ msgstr "secondi."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leta:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassificazione"
+
+#~ msgid "Cancelled"
+#~ msgstr "Annullato"
+
+#~ msgid "Completed"
+#~ msgstr "Completato"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Completato in data:"
+
+#~ msgid "High"
+#~ msgstr "Altezza"
+
+#~ msgid "In Progress"
+#~ msgstr "In corso"
+
+#~ msgid "Low"
+#~ msgstr "Basso"
+
+#~ msgid "Normal"
+#~ msgstr "Normale"
+
+#~ msgid "Not Started"
+#~ msgstr "Da cominciare"
+
+#~ msgid "S_ummary"
+#~ msgstr "_Riassunto"
+
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Data di _inizio:"
+
+#~ msgid "Task"
+#~ msgstr "Obiettivo"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Contatti..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "Sca_denza:"
+
+#~ msgid "_Priority:"
+#~ msgstr "_PrioritЮ:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Status:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "Threaded Message list"
-msgstr "LIsta di Messaggi a Thread"
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "Impossibile creare un file per l'obiettivo in `%s'"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on Se_nder"
-msgstr "Cartella virtuale sul _Mittente"
+#~ msgid "A_ll day event"
+#~ msgstr "_Eventi della giornata"
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "VFolder on _Recipients"
-msgstr "Cartella virtuale sui _Destinatari"
+#~ msgid "Appointment Basics"
+#~ msgstr "Appuntamenti di Base:"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "View Raw Message Source"
-msgstr "Vedi la sorgente grezza del messaggio"
+#~ msgid "Custom recurrence"
+#~ msgstr "Ricorrenza personalizzata"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Apply Filters"
-msgstr "_Applica Filtri"
+#~ msgid "Days"
+#~ msgstr "Giorni"
+
+#~ msgid "Every"
+#~ msgstr "Ogni"
+
+#~ msgid "Exceptions"
+#~ msgstr "Eccezioni"
+
+#~ msgid "Hours"
+#~ msgstr "Ore"
+
+#~ msgid "Mail _to:"
+#~ msgstr "_Scrivi a:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuti"
+
+#~ msgid "Modify"
+#~ msgstr "Modifica"
+
+#~ msgid "No recurrence"
+#~ msgstr "Nessuna Ricorrenza"
+
+#~ msgid "Preview"
+#~ msgstr "Anteprima"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vato"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pub_blico"
+
+#~ msgid "Recurrence"
+#~ msgstr "Ricorrenza"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regole di ricorrenza"
+
+#~ msgid "Reminder"
+#~ msgstr "Promemoria"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Semplice ricorrenza"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "_Indice:"
+
+#~ msgid "Time"
+#~ msgstr "Tempo"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Confidenziale"
+
+#~ msgid "_Contacts"
+#~ msgstr "_Contatti"
+
+#~ msgid "_Display"
+#~ msgstr "_Visualizza"
+
+#~ msgid "_End time:"
+#~ msgstr "Ora di _fine:"
+
+#~ msgid "_Mail"
+#~ msgstr "_Posta"
+
+#~ msgid "_Program"
+#~ msgstr "_Programma"
+
+#~ msgid "_Run program:"
+#~ msgstr "Esegui p_rogramma"
+
+#~ msgid "_Start time:"
+#~ msgstr "_Ora di inizio:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data di _inizio:"
+
+#~ msgid "day(s)"
+#~ msgstr "giorno(i)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "per"
+
+#~ msgid "forever"
+#~ msgstr "sempre"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "mese(i)"
+
+#~ msgid "until"
+#~ msgstr "fino a"
+
+#~ msgid "week(s)"
+#~ msgstr "Settimana(e)"
+
+#~ msgid "year(s)"
+#~ msgstr "anno(i)"
 
-#: po/tmp/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Configure Folder..."
-msgstr "_Configura Cartella"
+#~ msgid "Could not create a folder in `%s'"
+#~ msgstr "Impossibile creare un calendario in `%s'"
 
-#: po/tmp/evolution-mail.xml.h:53
-msgid "_Copy to Folder..."
-msgstr "_Copia nella cartella..."
+#~ msgid "April"
+#~ msgstr "Aprile"
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Edit Message"
-msgstr "M_odifica Messaggio"
+#~ msgid "August"
+#~ msgstr "Agosto"
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Expunge"
-msgstr "_Elimina per sempre"
+#~ msgid "December"
+#~ msgstr "Dicembre"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Filter on Subject"
-msgstr "_Filtro sull'Oggetto"
+#~ msgid "February"
+#~ msgstr "Febbraio"
 
-#: po/tmp/evolution-mail.xml.h:58
-msgid "_Forward"
-msgstr "_Inoltra"
+#~ msgid "Go To Date"
+#~ msgstr "Vai alla data"
 
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Inverti Selezione"
+#~ msgid "Go To Today"
+#~ msgstr "Vai a oggi"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Mail Configuration..."
-msgstr "Configurazione della _Posta..."
+#~ msgid "January"
+#~ msgstr "Gennaio"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Message"
-msgstr "_Messaggio"
+#~ msgid "July"
+#~ msgstr "Luglio"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Move to Folder..."
-msgstr "_Sposta nella Cartella..."
+#~ msgid "June"
+#~ msgstr "Giugno"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Open in New Window"
-msgstr "_Apri in una Nuova Finestra"
+#~ msgid "March"
+#~ msgstr "Marzo"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Print Message"
-msgstr "_Stampa Messaggio"
+#~ msgid "May"
+#~ msgstr "Maggio"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Save Message As..."
-msgstr "_Salva con Nome..."
+#~ msgid "November"
+#~ msgstr "Novembre"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "A _Thread"
+#~ msgid "October"
+#~ msgstr "Ottobre"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Ripristina"
+#~ msgid "September"
+#~ msgstr "Settembre"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_Cartella Virtuale sull'Oggetto"
+#~ msgid "Attachment properties"
+#~ msgstr "ProprietЮ dell'allegato"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "Editor delle Cartelle _Virtuali..."
+#~ msgid "File name:"
+#~ msgstr "Nome del file:"
 
-#.
-#. * 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 "Allega"
+#~ msgid "MIME type:"
+#~ msgstr "Tipo MIME:"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Chiudi il file corrente"
+#~ msgid "Edit VFolders"
+#~ msgstr "Modifica VFolder"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Cifra Messaggio con PGP"
+#~ msgid "Filter Rules"
+#~ msgstr "Regole dei Filtri"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Incoming"
+#~ msgstr "In entrata:"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Inserici un file come testo nel messaggio"
+#~ msgid "Outgoing"
+#~ msgstr "In uscita:"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Inserici un file di testo..."
+#~ msgid "Virtual Folders"
+#~ msgstr "Cartelle Virtuali"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Apri un file"
+#~ msgid "vFolder Sources"
+#~ msgstr "Sorgenti delle cartelle virtuali"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "Cifra con PGP"
+#~ msgid "Current store format:"
+#~ msgstr "Formato corrente di archiviazione:"
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "Firma con PGP"
+#~ msgid "Mailbox Format"
+#~ msgstr "Formato della Mailbox"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Salva con Nome"
+#~ msgid "New store format:"
+#~ msgstr "Nuovo formato di archiviazione:"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr ""
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr "Nota: durante la conversione tra formati mailbox, un errore\n"
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in _folder... (FIXME)"
-msgstr ""
+#~ msgid "maildir"
+#~ msgstr "maildir"
 
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Salva nella cartella..."
+#~ msgid "mbox"
+#~ msgstr "mbox"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Salva il file corrente con un nome diverso"
+#~ msgid "mh"
+#~ msgstr "mh"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Salva il messaggio in una cartella specificata"
+#~ msgid "Account"
+#~ msgstr "Account"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Invia"
+#~ msgid "Account Information"
+#~ msgstr "Informazioni sull'Account"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _Later"
-msgstr "Invia piЫ _Tardi"
+#~ msgid "Account Management"
+#~ msgstr "Gestione degli Account"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send _later"
-msgstr "Invia piЫ _tardi"
+#~ msgid "Account Properties"
+#~ msgstr "ProprietЮ dell'Account"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the mail in HTML format"
-msgstr "Invia la posta in formato HTML"
+#~ msgid "Advanced"
+#~ msgstr "Avanzate"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message later"
-msgstr "Invia il messaggio piЫ tardi"
+#~ msgid "Authentication"
+#~ msgstr "Autenticazione"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send the message now"
-msgstr "Invia il messaggio adesso"
+#~ msgid "Authentication Type:"
+#~ msgstr "Tipo di Autenticazione:"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Send this message now"
-msgstr "Invia questo messaggio adesso"
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr ""
+#~ "Congratulazioni, la configurazione della posta Х stata completata.\n"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show / hide attachments"
-msgstr "Mostra / nascondi allegati"
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show _attachments"
-msgstr "Mostra _allegati"
+#~ msgid "Done"
+#~ msgstr "Completato"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Show attachments"
-msgstr "Mostra allegati"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Indirizzo Email:"
 
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "Sign this message with your PGP key"
-msgstr "Frima questo messaggio con la chiave PGP"
+#~ msgid "Email Address:"
+#~ msgstr "Indirizzo Email:"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configurazione della Posta di Evolution"
 
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Open..."
-msgstr "_Apri..."
+#~ msgid "Full Name:"
+#~ msgstr "Nome e cognome:"
 
-#: po/tmp/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sicurezza"
+#~ msgid "Hostname:"
+#~ msgstr "Hostname:"
 
-#.
-#. * 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 "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
+#~ msgid "Identity"
+#~ msgstr "IdentitЮ"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Aggiorna Lista"
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server della Posta in entrata"
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Aggiorna la Lista delle Cartelle"
+#~ msgid "Keep mail on server"
+#~ msgstr "Non cancellare i messaggi dal server"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Iscrizione"
+#~ msgid "Mail"
+#~ msgstr "Posta"
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Annulla iscrizione"
+#~ msgid "Mail Account"
+#~ msgstr "Account di Posta"
 
-#.
-#. * 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 "Visualizza un'altra cartella"
+#~ msgid "Mail Configuration"
+#~ msgstr "Configurazione della Posta"
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "E_sci"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Configurazione guidata della Posta"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "_Barra del Collegamenti di Evolution"
+#~ msgid "Make this my default account"
+#~ msgstr "Imposta come mio account predefinito"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Esci dal Programma"
+#~ msgid "Miscellaneous"
+#~ msgstr "Varie"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Primi _Passi"
+#~ msgid "News"
+#~ msgstr "News"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Import an external file format"
-msgstr ""
+#~ msgid "Optional"
+#~ msgstr "Opzionale"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show information about Evolution"
-msgstr "Mostra informazioni su Evolution"
+#~ msgid "Organization:"
+#~ msgstr "Organizzazione:"
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Folder Bar"
-msgstr "Mostra la _Barra delle Cartelle"
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Server della Posta in Uscita"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Show the _Shortcut Bar"
-msgstr "Mostra la _Barra di Collegamento"
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Testo semplice"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Ricezione Email"
+
+#~ msgid "Remember my password"
+#~ msgstr "Ricorda la mia password"
+
+#~ msgid "Required"
+#~ msgstr "Richiesto"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Salva password"
+
+#~ msgid "Select signature file"
+#~ msgstr "Scegliere il file con la firma"
+
+#~ msgid "Sending Email"
+#~ msgstr "Invio Email"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Configurazione del Server"
+
+#~ msgid "Server Type: "
+#~ msgstr "Tipo di Server:"
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Il Server richiede l'autenticazione"
+
+#~ msgid "Servers"
+#~ msgstr "Server"
+
+#~ msgid "Signature file:"
+#~ msgstr "File con la firma:"
+
+#~ msgid "Signature:"
+#~ msgstr "Firma:"
+
+#~ msgid "Sources"
+#~ msgstr "Sorgenti"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Questo server richiede una connessione sicura (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Inserire il nome con il quale si desidera riferirsi a questi server. Per "
+#~ "esempio: \"Lavoro\" o \"Casa\"."
+
+#~ msgid "User Information"
+#~ msgstr "Informazioni Utente"
+
+#~ msgid "Username:"
+#~ msgstr "Username:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Configurazione guidata della Posta, benvenuti.\n"
+
+#~ msgid " for "
+#~ msgstr " per"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Cancella un contatto"
+
+#~ msgid "Find"
+#~ msgstr "Trova"
+
+#~ msgid "Find a contact"
+#~ msgstr "Trova un contatto"
+
+#~ msgid "Print contacts"
+#~ msgstr "Stampa contatti"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Arresta caricamento"
+
+#~ msgid "View All"
+#~ msgstr "Visualizza Tutto"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualizza tutti i contatti"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configurazione della _Rubrica..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Stampa _Contatti..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Ceca Contatti"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Giorni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Cambia preferenze"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ca_lendario"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Preferenze del Calendario..."
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit _Bug Report"
-msgstr "Inoltra un _Bug Report"
+#~ msgid "Create a new appointment"
+#~ msgstr "Crea un nuovo appuntamento"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy."
-msgstr "Inoltra un Bug Report usando Bug Buddy."
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea un nuovo calendario"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Toggle whether to show the folder bar"
-msgstr "Mostra/nasconde la barra delle cartelle"
+#~ msgid "Day"
+#~ msgstr "Giorno"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Mostra/nasconde la barra dei collegamenti"
+#~ msgid "Go back in time"
+#~ msgstr "Torna indietro nel tempo"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the C_ontact Manager"
-msgstr "Uso del manger dei C_ontatti"
+#~ msgid "Go forward in time"
+#~ msgstr "Vai avanti nel tempo"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Calendar"
-msgstr "Uso del _Calendario"
+#~ msgid "Go to"
+#~ msgstr "Vai al"
 
-#: po/tmp/evolution.xml.h:21
-msgid "Using the _Mailer"
-msgstr "Uso del programma di _Posta"
+#~ msgid "Go to a specific date"
+#~ msgstr "Vai ad una data specifica"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_About Evolution..."
-msgstr "_Informazioni su Evolution..."
+#~ msgid "Go to present time"
+#~ msgstr "Vai al presente"
+
+#~ msgid "Month"
+#~ msgstr "Mese"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Apri un calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Prec"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Stampa questo calendario"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salva calendario con altro nome"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Mostra 1 giorno"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Mostra 1 mese"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Mostra 1 settimana"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostra la settimana lavorativa"
+
+#~ msgid "Week"
+#~ msgstr "Settimana"
+
+#~ msgid "_New"
+#~ msgstr "_Nuovo"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Apri calendario"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Stampa questo calendario"
+
+#~ msgid "_Save As..."
+#~ msgstr "_Salva con nome..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Elimina quest'oggetto"
+
+#~ msgid "Delete..."
+#~ msgstr "Elimina..."
+
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Stampa _Busta..."
+
+#~ msgid "Print this item"
+#~ msgstr "Stampa questo articolo"
+
+#~ msgid "Print..."
+#~ msgstr "Stampa..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Salva _come..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Salva ed Esci"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Salva il contatto e chiudi la finestra di dialogo"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "_Invia contatto a altri..."
+
+#~ msgid "See online help"
+#~ msgstr "Vedere aiuto in linea"
+
+#~ msgid "_File"
+#~ msgstr "_File"
+
+#~ msgid "_Print..."
+#~ msgstr "S_tampa..."
+
+#~ msgid "_Save"
+#~ msgstr "_Salva"
+
+#~ msgid "About this application"
+#~ msgstr "Informazioni su questa applicazione"
+
+#~ msgid "About..."
+#~ msgstr "Informazioni su..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Annulla"
+
+#~ msgid "C_ut"
+#~ msgstr "_Taglia"
+
+#~ msgid "Clear"
+#~ msgstr "Annulla"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Annulla la Selezione"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Chiudi questo appuntamento"
+
+#~ msgid "Copy"
+#~ msgstr "Copia"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copia selezionato"
+
+#~ msgid "Cut"
+#~ msgstr "Taglia"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Taglia selezionato"
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Fa un Dump della descrizione UI Xml"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Address _Book..."
 
-#: po/tmp/evolution.xml.h:23
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "Appuntamenti:"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Ricorrenza"
+
+#~ msgid "Find Again"
+#~ msgstr "Cerca ancora"
+
+#~ msgid "Find _Again"
+#~ msgstr "Trova _Ancora"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Modifica le proprietЮ del file"
+
+#~ msgid "N_ext"
+#~ msgstr "S_uccessivo"
+
+#~ msgid "Paste"
+#~ msgstr "Incolla"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Incolla agli appunti"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Impostazioni Stampa..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Impostazione pagina"
+
+#~ msgid "Properties"
+#~ msgstr "ProprietЮ"
+
+#~ msgid "Redo"
+#~ msgstr "Rifai"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Rifai l'azione annullata"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid "Replace a string"
+#~ msgstr "Sostituisci una stringa"
+
+#~ msgid "Save"
+#~ msgstr "Salva"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+
+#~ msgid "Save the current file"
+#~ msgstr "Salva il file corrente"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Pianifica una Riunione"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Pianifica una _Riunione"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Pianifica un tipo di riunione"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Cerca ancora la stessa stringa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Cerca una stringa"
+
+#~ msgid "Select All"
+#~ msgstr "Seleziona Tutto"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleziona ogni cosa"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Imposta i parametri della pagina per la stampante corrente"
+
+#~ msgid "Undo"
+#~ msgstr "Annulla"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Annulla l'ultima azione"
+
+#~ msgid "_About..."
+#~ msgstr "_Informazioni su"
+
+#~ msgid "_Close"
+#~ msgstr "_Chiudi"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copia"
+
+#~ msgid "_Debug"
+#~ msgstr "_Debug"
+
+#~ msgid "_Edit"
+#~ msgstr "_Modifica"
+
+#~ msgid "_Find..."
+#~ msgstr "_Trova..."
+
+#~ msgid "_Help"
+#~ msgstr "_Aiuto"
+
+#~ msgid "_Paste"
+#~ msgstr "_Incolla"
+
+#~ msgid "_Print"
+#~ msgstr "S_tampa"
+
+#~ msgid "_Properties..."
+#~ msgstr "_ProprietЮ"
+
+#~ msgid "_Redo"
+#~ msgstr "_Rifai"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Sostituisci"
+
+#~ msgid "_Undo"
+#~ msgstr "_Annulla"
+
+#~ msgid "Compose"
+#~ msgstr "Scrivi"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Scrivi un nuovo messaggio"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia messaggio in una nuova cartella"
 
-#: po/tmp/evolution.xml.h:24
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Editor dei Contatti"
+#~ msgid "Create Rule"
+#~ msgstr "Crea Regola dal Messaggio"
+
+#~ msgid "F_older"
+#~ msgstr "C_artelle"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltra sul Mittente"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Folder"
-msgstr "_Cartelle"
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtro sui _Destinatari"
 
-#: po/tmp/evolution.xml.h:28
-msgid "_Go to Folder..."
-msgstr "_Vai alla cartella..."
+#~ msgid "Forget _Passwords"
+#~ msgstr "Dimantica _Password"
+
+#~ msgid "Get Mail"
+#~ msgstr "Ricevi Posta"
+
+#, fuzzy
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Nascondi i messaggi _Selezionati"
 
-#: po/tmp/evolution.xml.h:30
 #, fuzzy
-msgid "_Import file..."
-msgstr "Inserici un file di testo..."
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Nascondi i messaggi _Cancellati"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Nascondi i messaggi _Letti"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtri Posta..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Gestione sottoscrizioni..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "S_egna come Letto"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Segna come _Non Letto"
 
-#: po/tmp/evolution.xml.h:31
-msgid "_Index"
-msgstr "_Indice"
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Sposta il messaggio in una nuova cartella"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Anteprime del messaggio da stampare"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Anteprima di stampa del messaggio..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Stampa messaggio con la stampante"
+
+#~ msgid "Print message..."
+#~ msgstr "Stampa messaggio..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Rispondi a _Tutti"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Rispondi al _Mittente"
 
-#: po/tmp/evolution.xml.h:32
 #, fuzzy
-msgid "_Mail message"
-msgstr "_Invia messaggio"
+#~ msgid "S_ource"
+#~ msgstr "Sorgente"
 
-#: po/tmp/evolution.xml.h:34
-msgid "_Settings"
-msgstr "_Impostazioni"
+#~ msgid "Select _All"
+#~ msgstr "Seleziona _Tutto"
 
-#: po/tmp/evolution.xml.h:35
-msgid "_Task (FIXME)"
-msgstr ""
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#, fuzzy
+#~ msgid "Show _All Messages"
+#~ msgstr "Mostra _Tutti i messaggi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativo"
+#~ msgid "Threaded Message list"
+#~ msgstr "LIsta di Messaggi a Thread"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Occupato"
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Cartella virtuale sul _Mittente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Assente"
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Cartella virtuale sui _Destinatari"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nessuna informazione"
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vedi la sorgente grezza del messaggio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invita altri..."
+#~ msgid "_Apply Filters"
+#~ msgstr "_Applica Filtri"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opzioni"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Copia nella cartella..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Mostra s_olo le ore lavorative"
+#~ msgid "_Edit Message"
+#~ msgstr "M_odifica Messaggio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vista _allargata"
+#~ msgid "_Expunge"
+#~ msgstr "_Elimina per sempre"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "A_ggiorna libero/Occupato"
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtro sull'Oggetto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "_Forward"
+#~ msgstr "_Inoltra"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autopick"
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverti Selezione"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configurazione della _Posta..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Tutto il Personale e le Risorse"
+#~ msgid "_Message"
+#~ msgstr "_Messaggio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Tutto il _Personale e una Risorsa"
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Sposta nella Cartella..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Personale _Richiesto"
+#~ msgid "_Open in New Window"
+#~ msgstr "_Apri in una Nuova Finestra"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Personale Richiesto e _una risorsa"
+#~ msgid "_Print Message"
+#~ msgstr "_Stampa Messaggio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "_Inizio appuntamento ore:"
+#~ msgid "_Save Message As..."
+#~ msgstr "_Salva con Nome..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "T_ermine dell' appuntamento ore:"
+#~ msgid "_Threaded"
+#~ msgstr "A _Thread"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tutti i partecipanti"
+#~ msgid "_Undelete"
+#~ msgstr "_Ripristina"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMGVSD"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Cartella Virtuale sull'Oggetto"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Editor delle Cartelle _Virtuali..."
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Attach"
+#~ msgstr "Allega"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Adesso"
+#~ msgid "Close the current file"
+#~ msgstr "Chiudi il file corrente"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Cifra Messaggio con PGP"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppo %i"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Inserici un file come testo nel messaggio"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Inserici un file di testo..."
+
+#~ msgid "Open a file"
+#~ msgstr "Apri un file"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Cifra con PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Firma con PGP"
+
+#~ msgid "Save As"
+#~ msgstr "Salva con Nome"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Salva nella cartella..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Salva il file corrente con un nome diverso"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Salva il messaggio in una cartella specificata"
+
+#~ msgid "Send"
+#~ msgstr "Invia"
+
+#~ msgid "Send _Later"
+#~ msgstr "Invia piЫ _Tardi"
+
+#~ msgid "Send _later"
+#~ msgstr "Invia piЫ _tardi"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Invia la posta in formato HTML"
+
+#~ msgid "Send the message later"
+#~ msgstr "Invia il messaggio piЫ tardi"
+
+#~ msgid "Send the message now"
+#~ msgstr "Invia il messaggio adesso"
+
+#~ msgid "Send this message now"
+#~ msgstr "Invia questo messaggio adesso"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Mostra / nascondi allegati"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Mostra _allegati"
+
+#~ msgid "Show attachments"
+#~ msgstr "Mostra allegati"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Frima questo messaggio con la chiave PGP"
+
+#~ msgid "_Open..."
+#~ msgstr "_Apri..."
+
+#~ msgid "_Security"
+#~ msgstr "_Sicurezza"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
+
+#~ msgid "Refresh List"
+#~ msgstr "Aggiorna Lista"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Aggiorna la Lista delle Cartelle"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
+
+#~ msgid "Subscribe"
+#~ msgstr "Iscrizione"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Annulla iscrizione"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Visualizza un'altra cartella"
+
+#~ msgid "E_xit"
+#~ msgstr "E_sci"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Barra del Collegamenti di Evolution"
+
+#~ msgid "Exit the program"
+#~ msgstr "Esci dal Programma"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Primi _Passi"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Mostra informazioni su Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostra la _Barra delle Cartelle"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Mostra la _Barra di Collegamento"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Inoltra un _Bug Report"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Inoltra un Bug Report usando Bug Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Mostra/nasconde la barra delle cartelle"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Mostra/nasconde la barra dei collegamenti"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso del manger dei C_ontatti"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso del _Calendario"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso del programma di _Posta"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Informazioni su Evolution..."
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Appuntamenti:"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Editor dei Contatti"
+
+#~ msgid "_Folder"
+#~ msgstr "_Cartelle"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Vai alla cartella..."
+
+#, fuzzy
+#~ msgid "_Import file..."
+#~ msgstr "Inserici un file di testo..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indice"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "_Invia messaggio"
+
+#~ msgid "_Settings"
+#~ msgstr "_Impostazioni"
 
 #~ msgid "Server disconnected."
 #~ msgstr "Server disconnesso."
diff --git a/po/ja.po b/po/ja.po
index a7faa106c8..afb79ea305 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010111\n"
-"POT-Creation-Date: 2001-01-11 05:15+0900\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-11 09:22+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -14,6 +14,180 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К (CamelLocal ╔п║╪╔╦╔Г╔С)"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "%s ╓╚╓И╔А║╪╔К╓Р╪ХфюцФ"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, c-format
+msgid "Close %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "╔у╔╘╔К╔ю╓ь╟эф╟"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "а╟╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "╪║╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "╔А║╪╔К╔у╔║╔╓╔К╓нфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "╔╗╔И║╪╓о╓╒╓Й╓ч╓╩╓С"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "%s ╓н POP ╔╣║╪╔п╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "New"
+msgstr "©╥╣╛..."
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "л╬╩и: "
@@ -284,17 +458,6 @@ msgstr ""
 "\n"
 "╦ЬЁ╚╦╟: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c: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.
@@ -414,28 +577,28 @@ msgstr ""
 "gnome-pilot ╔г║╪╔Б╔С╓╚╓И╔я╔╓╔М╔ц╔х╔Й╔╧╔х╓Р\n"
 "╪Хфю╓╥╓Х╓╕╓х╓╥╓©╩Ч╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "╔╚║╪╔╫╔К╓офи╓ъ╧Ч╓ч╓Л╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook ╓о╔М║╪╔и╓╣╓Л╓ф╓╓╓ч╓╩╓С\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "wombat ╔╣║╪╔п╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "wombat ╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╒╔и╔Л╔╧╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -585,19 +748,23 @@ msgid "Details"
 msgstr "╬э╨ы"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "╔╒╔╥╔╧╔©╔С╔х"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "╩е╩Ж"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "╩е╩Ж 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "╩е╩Ж╓н FAX"
 
@@ -606,6 +773,7 @@ msgid "Callback"
 msgstr "╦ф╓слА╓╥"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "╪ж"
 
@@ -615,27 +783,33 @@ msgstr "╡Я╪р"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "╡х"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "╡х 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "╡х╓н FAX"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "╔Б╔п╔╓╔К"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "╓╫╓нб╬"
 
@@ -644,10 +818,12 @@ msgid "Other Fax"
 msgstr "╓╫╓нб╬╓н FAX"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "╔щ╔╠╔ы╔К"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "╔в╔И╔╓╔ч╔Й"
 
@@ -664,10 +840,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "╔А║╪╔К2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "╔А║╪╔К3"
 
@@ -772,27 +950,27 @@ msgstr ""
 "╔ю╔╕╔С╔М║╪╔и║╓╓╫╓╥╓ф╔╓╔С╔╧╔х║╪╔К╓╥╓ф, ╔Ё╔С╔я╔╓╔К╩ед╬╓╥\n"
 "╓ф Evolution ╓Р╔╓╔С╔╧╔х║╪╔К╓╧╓Ки╛мв╓╛╓╒╓К╓г╓╥╓Г╓╕.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "╓╧╓ы╓фи╫╪╗"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "╬э╨ы..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "╔у╔ё║╪╔К╔и╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:705
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "╔у╔╘╔К╔ю╔ж╔И╔╕╔╤╓╛и╫╪╗╓╧╓К URI"
 
@@ -817,7 +995,7 @@ msgid "None (anonymous mode)"
 msgstr "╓й╓╥ (ф©л╬╔Б║╪╔и)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
@@ -916,7 +1094,69 @@ msgstr "╦║╨В"
 msgid "Save as VCard"
 msgstr "VCard ╓гйщб╦"
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#, fuzzy
+msgid "Name"
+msgstr "л╬а╟:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "╔А║╪╔К2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "ц╢еЖиТ╫П(_D):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "╩ЖлЁ╫Й(_O):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "╥и╬н(а╟╓д╓╠)(_T):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "юЛлГ©╕(_P):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "╔щ╔╠╔ы╔К"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "╔к╔ц╔╞╔м║╪╔Ю(_N):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "гш╤Ж╪т(_S):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "╔н║╪╔х"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "╔╒╔и╔Л╔╧д╒╓кйщб╦"
 
@@ -942,13 +1182,13 @@ msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х╓н╓©╓А╓нюъдЙ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓г╓╧\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "╔╚╔Л╔С╔ю╔╣║╪╔п╓гдл©╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╚╔Л╔С╔ю╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -961,8 +1201,8 @@ msgstr "Evolution ToDo ╔Ё╔С╔╦╔ц╔х"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Evolutiuon ToDo ╔Ё╔С╔╦╔ц╔х╓н╓©╓А╓нюъдЙ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓г╓╧\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н ToDo ╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -982,26 +1222,26 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "╔у╔║╔╓╔К╓╛╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "╔╚╔Л╔С╔ю╓Рйщб╦"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "╔╚╔Л╔С╔ю╔с╔Е║╪╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©. ORBit╓хOAF╓нюъдЙ╓Р╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1009,57 +1249,57 @@ msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %I:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:326
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "╦Ье╙"
 
-#: calendar/gui/calendar-model.c:329
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "╩Де╙"
 
-#: calendar/gui/calendar-model.c:332
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "╣║л╘"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "л╓цн"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "кл"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "фН"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "еЛ"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "ю╬"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "ф╘лю"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "итф╘лю"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1071,7 +1311,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1079,27 +1319,27 @@ 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:845
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr "%H:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:848
+#: calendar/gui/calendar-model.c:896
 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:852
+#: calendar/gui/calendar-model.c:900
 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:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1109,90 +1349,86 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "╔я║╪╔╩╔С╔хцм╓о 0 ╓х 100 ╓н╢ж╓г╢ч╓С╓г╓╓╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "м╔юХ╫Г╟л╓о 1 ╓х 9 ╓н╢ж╓г╢ч╓С╓г╓╓╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-summary.c:93
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%p %I:%M"
 
-#: calendar/gui/calendar-summary.c:298
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪</b>"
 
-#: calendar/gui/calendar-summary.c:303
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪:<br>╔╚╔Л╔С╔ю╓о╩хмяцФ╓г╓╧"
-
-#: calendar/gui/calendar-summary.c:309
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪:<br>╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: calendar/gui/calendar-summary.c:475
+#: calendar/gui/calendar-summary.c:484
 msgid "Display"
 msgstr "и╫╪╗"
 
-#: calendar/gui/calendar-summary.c:480
+#: calendar/gui/calendar-summary.c:489
 msgid "Show appointments"
 msgstr "лСб╚╓ни╫╪╗"
 
-#: calendar/gui/calendar-summary.c:488
+#: calendar/gui/calendar-summary.c:497
 msgid "Show tasks"
 msgstr "╔©╔╧╔╞╓ни╫╪╗"
 
-#: calendar/gui/calendar-summary.c:580
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "╔╚╔Л╔С╔ю╓╛и╫╪╗╓╧╓К URI"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M ╓к╔╒╔И║╪╔Ю"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "мЬмя╓г╓╜╓К╔╣╔ч╔Й║╪╓о╓╒╓Й╓ч╓╩╓С"
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "кэеЖ╓клСб╚ `%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "кэеЖ╓кл╣╔©╔╓╔х╔К╓нлСб╚╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "кэеЖ╓к╔©╔╧╔╞ `%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "кэеЖ╓кл╣╔©╔╓╔х╔К╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "кэеЖ╓к╩елУ╣╜фЧ `%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "кэеЖ╓кл╣╔©╔╓╔х╔К╓н╩елУ╣╜фЧ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
@@ -1200,130 +1436,199 @@ msgstr "кэеЖ╓кл╣╔©╔╓╔х╔К╓н╩елУ╣╜фЧ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 msgid "Edit Task"
 msgstr "╔©╔╧╔╞╓нйт╫╦"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "╔╣╔ч╔Й║╪╓й╓╥"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "лСб╚ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "╔©╔╧╔╞ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "╩елУ╣╜фЧ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "йя╧╧╓Рйщб╦╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr ""
+"\n"
+"╤хлЁй╛лН: "
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr ""
+"\n"
+"цбю╦фЭ: "
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "╢╟н╩╓╥╓©╔©╔╧╔╞╓Р╔ч║╪╔╞╓╥╓ч╓╧"
+
+#: calendar/gui/e-calendar-table.c:162
+#, fuzzy
+msgid "Priority"
+msgstr "╔в╔И╔╓╔ч╔Й"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "╔╣╔ч╔Й║╪╓й╓╥"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "ф╘лю"
+
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Ё╚╓╞..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "╔©╔╧╔╞╓РЁ╚╓╜╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "╢╟н╩╓Р╔ч║╪╔╞"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "╢╟н╩╓╥╓©╔©╔╧╔╞╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:685 mail/mail-view.c:150
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
 msgid "Delete"
 msgstr "╨О╫Э"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "╦Аа╟"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "╦А╦Е"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "©╥╣╛лСб╚..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "╓Ё╓нлСб╚╓Рйт╫╦..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "╓Ё╓нлСб╚╓Р╡дф╟╓к╓╧╓К"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"╤хлЁй╛лН: "
+
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' ╓н╔©╔╧╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/e-tasks.c:292
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "'%s' ╓н╔©╔╧╔╞╔у╔║╔╓╔К╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
-
-#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
@@ -1331,80 +1636,82 @@ msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/event-editor.c:330
+#: calendar/gui/event-editor.c:331
 msgid "Edit Appointment"
 msgstr "лСб╚╓нйт╫╦"
 
-#: calendar/gui/event-editor.c:408
+#: calendar/gui/event-editor.c:409
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 msgid "day"
 msgstr "фЭ"
 
-#: calendar/gui/event-editor.c:434
+#: calendar/gui/event-editor.c:435
 msgid "Monday"
 msgstr "╥НмкфЭ"
 
-#: calendar/gui/event-editor.c:435
+#: calendar/gui/event-editor.c:436
 msgid "Tuesday"
 msgstr "╡пмкфЭ"
 
-#: calendar/gui/event-editor.c:436
+#: calendar/gui/event-editor.c:437
 msgid "Wednesday"
 msgstr "©ЕмкфЭ"
 
-#: calendar/gui/event-editor.c:437
+#: calendar/gui/event-editor.c:438
 msgid "Thursday"
 msgstr "лзмкфЭ"
 
-#: calendar/gui/event-editor.c:438
+#: calendar/gui/event-editor.c:439
 msgid "Friday"
 msgstr "╤БмкфЭ"
 
-#: calendar/gui/event-editor.c:439
+#: calendar/gui/event-editor.c:440
 msgid "Saturday"
 msgstr "езмкфЭ"
 
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/event-editor.c:441
 msgid "Sunday"
 msgstr "фЭмкфЭ"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "╫пмХ╩Ж"
 
-#: calendar/gui/event-editor.c:838
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "╓Ё╓нлСб╚╓о Evolution ╓╛йт╫╦╫пмХ╓й╓╓╨фх╞╓Р╢ч╓С╓г╓╓╓ч╓╧"
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
 #. Initialize by default to three-letter day names
 #: calendar/gui/gnome-month-item.c:736
@@ -1627,11 +1934,11 @@ msgstr "╨ёг╞ (%Y)"
 msgid "Print Calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪"
 
-#: calendar/gui/tasks-control.c:103
+#: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "╔©╔╧╔╞╔у╔╘╔К╔ю╓╛и╫╪╗╓╧╓К URI"
 
@@ -1726,29 +2033,36 @@ msgstr "%s ╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╔Б╔╦╔Е║╪╔К╓н╔Ё║╪╔и╓╛╫И╢Э╡╫╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/camel-remote-store.c:183
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s ╔╣║╪╔п %s"
 
-#: camel/camel-remote-store.c:187
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:235
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (╔щ║╪╔х %d) ╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(л╓цн╓н╔ш╔╧╔х)"
 
-#: camel/camel-remote-store.c:460
-msgid "Server disconnected."
-msgstr "╔╣║╪╔п╓х╓нюэбЁ╓оюзцг╓╣╓Л╓ч╓╥╓©"
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
 
 #: camel/camel-service.c:137
 #, c-format
@@ -1775,12 +2089,12 @@ msgstr "╓╫╓н╓Х╓╕╓й╔ш╔╧╔х %s ╓о╓╒╓Й╓ч╓╩╓С"
 msgid "Temporarily unable to look up hostname %s."
 msgstr "╟Л╩Че╙╓к╔ш╔╧╔хл╬ %s ╓Р╦╚╓д╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "╔в╔М╔х╔Ё╔К `%s' ╓РмЬмя╓г╓╜╓К╔в╔М╔п╔╓╔ю╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -1817,40 +2131,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╔Ё╔ч╔С╔и╓о╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "л╓цн╓н╔╗╔И║╪"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "╔╣║╪╔п╔Л╔╧╔щ╔С╔╧╓о╓╒╓ц╓╠╓й╓╞╫╙╓О╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╔╣║╪╔п╓н╠ЧеЗ╓о %s ╬ПйС╓Р╢ч╓С╓г╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓ OK ╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ╓н╔╣╔ч╔Й║╪╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ╠ЧеЗ╓к╔А╔ц╔╩║╪╔╦кэбн╓Р╦╚иу╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -1862,26 +2177,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ╔╣║╪╔п╓г╔А║╪╔К╓Рфи╓С╓ю╓Йцъюя╓╧╓К╓©╓А╓н╓Б╓н╓г╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:261
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о Kerberos 4 г╖╬з╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:335
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s ╓н IMAP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/imap/camel-imap-store.c:363
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -1892,13 +2207,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:619
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й %s ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+#, fuzzy
+msgid "MH-format mail directories"
 msgstr "UNIX MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й (CamelLocal ╔п║╪╔╦╔Г╔С)"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -1906,15 +2222,16 @@ msgid "For storing local mail in MH-like mail directories"
 msgstr "MH╔И╔╓╔╞╓й╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й╓к╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К (CamelLocal ╔п║╪╔╦╔Г╔С)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 msgid "For storing local mail in standard mbox format"
 msgstr "и╦╫Ю mbox ╥©╪╟╓г╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
 msgstr "UNIX qmail maildir╥©╪╟╓н╔А║╪╔К╔у╔║╔╓╔К (CamelLocal ╔п║╪╔╦╔Г╔С)"
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -2487,49 +2804,49 @@ msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
 #: camel/providers/smtp/camel-smtp-transport.c:574
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "RCPT TO ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:621
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
-#: camel/providers/smtp/camel-smtp-transport.c:654
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA аВ©╝╓н╔©╔╓╔Ю╔╒╔╕╔х: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:694
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
@@ -2575,8 +2892,8 @@ msgstr "е╨иу"
 msgid "Attach a file"
 msgstr "╔у╔║╔╓╔К╓Ре╨иу╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "╨О╫Э"
 
@@ -2592,40 +2909,40 @@ msgstr "е╨иу╓нди╡ц..."
 msgid "Attach a file to the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓ь╔у╔║╔╓╔К╓Ре╨иу╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "аВ©╝╪т:"
 
-#: composer/e-msg-composer-hdrs.c:249
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "╔╒╔и╔Л╔╧д╒╓н╓©╓А╓к╓Ё╓Ё╓г╔╞╔Й╔ц╔╞"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓©╓╓©х╦╣╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:310 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "╪У©╝╪т:"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╪У╪Х©м╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:316
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:322
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2633,11 +2950,11 @@ msgstr ""
 "╔А╔ц╔╩║╪╔╦╓н╪У╪Х©м╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, "
 "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "╔А║╪╔К╓ни╫бЙ╓РфЧно╓╥╓ч╓╧"
 
@@ -2650,38 +2967,38 @@ msgstr ""
 "╫Пл╬╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦цФ..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "'аП╟фх╒' ╓ьаП╟ф╓Рйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©: %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2691,27 +3008,27 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "╓╫╓Л╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2719,26 +3036,22 @@ msgstr ""
 "╔у╔║╔╓╔К╓о╓х╓ф╓БбГ╓╜╓╓ (100K ╟й╬Е) ╓г╓╧\n"
 "кэеЖ╓к╓╫╓Л╓РачфЧ╓╧╓К╓Ё╓х╓Рк╬╓ъ╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution ╔А║╪╔К╨Ню╝╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "╦║╨В(_c)"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "г╞"
@@ -3030,6 +3343,7 @@ msgid "Regex Match"
 msgstr "ю╣╣╛и╫╦╫╓х╟Лцв"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
 msgid "Score"
 msgstr "╣╜о©"
 
@@ -3049,7 +3363,7 @@ msgstr "╔╫║╪╔╧"
 msgid "Specific header"
 msgstr "╩ьдЙ╓н╔ь╔ц╔ю"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
 msgid "Status"
 msgstr "╔╧╔ф║╪╔©╔╧"
 
@@ -3057,7 +3371,7 @@ msgstr "╔╧╔ф║╪╔©╔╧"
 msgid "Stop Processing"
 msgstr "╫ХмЩдД╩ъ"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
 msgid "Subject"
 msgstr "и╫бЙ"
 
@@ -3157,179 +3471,160 @@ msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нди╡ц"
 msgid "Edit VFolder Rule"
 msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нйт╫╦"
 
-#: mail/component-factory.c:280
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223
-msgid "Save"
-msgstr "йщб╦"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "кэбн╓ч╓©╓ои╫бЙ╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "кэбн╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "и╫бЙ╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "кэбн╓╛╪║╓н╓Б╓н╓Р╢ч╓ч╓й╓╓"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "и╫бЙ╓╛╪║╓н╓Б╓н╓Р╢ч╓ч╓й╓╓"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "и╫бЙ╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "и╫бЙ╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "╓╧╓ы╓ф╓нхСи╫╪╗╓Ри╫╪╗"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "╢Шфи╓Р╠ё╓╧"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "╨О╫Э╓Р╠ё╓╧"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "и╫бЙ╓Р╠ё╓╧"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "╪║╓наВ©╝╪т╓Р╠ё╓╧"
-
-#: mail/folder-browser.c:670
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Ё╚╓╞"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:659
 msgid "Edit"
 msgstr "йт╫╦"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "╟У╨Ч"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "аВ©╝╪т╓ьйж©╝"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "а╢╟В╓ьйж©╝"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "е╬аВ"
 
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "╔╓╔С╔И╔╓╔С╓ге╬аВ"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя"
 
-#: mail/folder-browser.c:692
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔К║╪╔К╓Р╨Ню╝"
 
-#: mail/folder-browser.c:693
-msgid "Hide Messages"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔© (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "и╫бЙ \"%s\" ╓Р╠ё╓╧"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "╔н║╪╔х"
 
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "аВ©╝╪т <%s> ╓╚╓И╓Р╠ё╓╧"
+#: mail/mail-accounts.c:115
+msgid " (default)"
+msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:343
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔ч╔м║╪╔╦╔Ц"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:588
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╗╔г╔ё╔©"
 
@@ -3353,7 +3648,7 @@ msgstr "%s ╓╚╓И╔А║╪╔К"
 msgid "%s mailing list"
 msgstr "%s ╔А║╪╔Й╔С╔╟╔Й╔╧╔х"
 
-#: mail/mail-callbacks.c:78
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3365,7 +3660,7 @@ msgstr ""
 "и╛мв╓╛╓╒╓Й╓ч╓╧\n"
 "╨ёюъдЙ╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:121
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3373,7 +3668,7 @@ msgstr ""
 "╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к©х╦╣╓н\n"
 "юъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: mail/mail-callbacks.c:133
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3381,19 +3676,15 @@ msgstr ""
 "╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к╔А║╪╔К\n"
 "гшаВ╓нюъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
-msgid "You have no mail sources configured"
-msgstr "╔А║╪╔К╔╫║╪╔╧╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
-
-#: mail/mail-callbacks.c:218
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "╔А║╪╔Ке╬аВ╔А╔╫╔ц╔и╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "аВ©╝х╒╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:249
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3401,23 +3692,30 @@ msgstr ""
 "╓Ё╓н╔А╔ц╔╩║╪╔╦╓ои╫бЙ╓╛╓╒╓Й╓ч╓╩╓С\n"
 "кэеЖ╓каВ©╝╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к©х╦╣╓н\n"
+"юъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╧╓Ке╛юз╓й╪У©╝╪т╓Р╩ьдЙ╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:537
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3425,11 +3723,11 @@ msgstr ""
 "╔и╔И╔у╔х╔у╔╘╔К╔юфБ╓кйщб╦╓╣╓Л╓©\n"
 "╔А╔ц╔╩║╪╔╦╓ю╓╠╓Рйт╫╦╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3437,15 +3735,15 @@ msgstr ""
 "╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
 "╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:923
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3454,16 +3752,30 @@ msgstr ""
 "╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
 "%s"
 
-#: mail/mail-callbacks.c:972
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 
+#: mail/mail-config-druid.c:363
+#, c-format
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
+msgstr ""
+
+#: mail/mail-config-druid.c:629
+#, c-format
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
+msgstr ""
+
 #. set window title
-#: mail/mail-config-druid.c:821
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╕╔ё╔╤║╪╔и"
 
@@ -3516,52 +3828,52 @@ msgstr "╔╓╔С╔И╔╓╔Си╫╪╗ (%s╥пмЁ)"
 msgid "Hide"
 msgstr "╠ё╓╧"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s ╓Ре╨иу"
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:626
 msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ои╫╪╗╓╥╓ч╓╩╓С"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "╔╒╔╓╔Ё╔С╓Р╔╞╔Й╔ц╔╞╓╥╓фиЭ╧Ф╡╫╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-format.c:1440
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ╔╣╔╓╔х (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1452
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "╔М║╪╔╚╔К╔у╔║╔╓╔К (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1490
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "л╓цн╓нЁ╟иТ╔г║╪╔© (\"%s\" ╔©╔╓╔в) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1495
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1665
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
@@ -3650,143 +3962,143 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "%s ╓╚╓И╔А║╪╔К╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:91
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "%s ╓╚╓И╔А║╪╔К╓Р╪Хфю"
 
-#: mail/mail-ops.c:336
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "©╥╣╛╔А║╪╔К╓о %s ╓к╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-ops.c:406
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓Р╔у╔ё╔К╔©цФ"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓Р╔у╔ё╔К╔©"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:670
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "╔╜╔Е║╪╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "╔╜╔Е║╪╓РаВ©╝"
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:812
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "\"%s\" ╓Рди╡ццФ"
 
-#: mail/mail-ops.c:809 mail/mail-ops.c:815
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Риу╡ц"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟цФ"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟"
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪"
 
-#: mail/mail-ops.c:936
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "╟эф╟цФ"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:959
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р %s %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(юБлю╓й╓╥)"
 
-#: mail/mail-ops.c:1165
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "╔у╔╘╔К╔ю╓Рф╠╢ЭцФ"
 
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "╔у╔╘╔К╔ю╓Р╨О╫ЭцФ"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "╔А╔ц╔╩║╪╔╦ %s ╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦хж╧Ф %d / %d (uid \"%s\") ╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "%s ╔у╔╘╔К╔ю (%s мя) ╓Р╔М║╪╔ицФ"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "%s ╔у╔╘╔К╔ю (%s мя) ╓Р╔М║╪╔и"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -3795,12 +4107,12 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d (uid \"%s\") ╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -3947,121 +4259,165 @@ msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 msgid "Delete this message"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "л╓фи"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "╢Шфи"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "йжеЗ╨я╓ъ"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:890
 #, 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:896 mail/message-list.c:912
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<л╓цн>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "╨ёфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "╨РфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%p %I:%M (%a)"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %p %l:%M"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/openpgp-utils.c:76
-#, c-format
-msgid "Please enter your %s passphrase%s%s"
-msgstr "╓╒╓й╓©╓н %s ╔я╔╧╔у╔Л║╪╔╨%s%s╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "е╨иу"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "аВ©╝╪т:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "╦Е"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "╪У©╝фЭ"
 
-#: mail/openpgp-utils.c:77
-msgid " for "
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "╪У©╝╪т:"
+
+#: mail/message-list.c:1111
+msgid "Size"
 msgstr ""
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "╓╒╓й╓©╓н %s ╔я╔╧╔у╔Л║╪╔╨%s%s╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "╓╒╓й╓©╓н %s ╔я╔╧╔у╔Л║╪╔╨%s%s╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP ╔в╔М╔╟╔И╔Ю╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
 msgid "No password provided."
 msgstr "дС╤║╓╣╓Л╓©╔я╔╧╔О║╪╔и╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
 msgid "No recipients specified"
 msgstr "╪У©╝╪т╓╛╩ьдЙ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: mail/openpgp-utils.c:1061
+#: mail/openpgp-utils.c:1065
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "╨Н╤х╔у╔║╔╓╔К╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/subscribe-dialog.c:139
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "╔у╔╘╔К╔ю"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "╣╜о©"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -4170,23 +4526,24 @@ msgstr ""
 msgid "New..."
 msgstr "©╥╣╛..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ╓о╓╒╓й╓©╓н $PATH ╓к╓о╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ╓о╪б╧т╓г╓╜╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -4198,7 +4555,7 @@ msgstr ""
 "╔╟╔К║╪╔в╔╕╔╖╔╒╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓н\n"
 "╔я╔ц╔╠║╪╔╦╔╫╔у╔х╓г╓╧"
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
@@ -4206,20 +4563,18 @@ msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 msgid "(No folder displayed)"
 msgstr "(и╫╪╗╓╥╓©╔у╔╘╔К╔ю╓о╓╒╓Й╓ч╓╩╓С)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "╔у╔╘╔К╔ю"
 
-#. 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:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "╔н║╪╔х"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -4227,7 +4582,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "╤ииТ╣╜╡╠аУцж╓н╔╩╔ц╔х╔╒╔ц╔в╓╛╫пмХ╓ч╓╩╓С -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4236,15 +4591,15 @@ msgstr ""
 "`%s' ╔с╔Е║╪╓офмаЁ╩Юк╢╓╥╓ч╓╥╓© :-(\n"
 "╓Ё╓Л╓о╓©╓ж╓С %s ╔Ё╔С╔щ║╪╔м╔С╔х╓╛╔╞╔И╔ц╔╥╔Е╓╥╓©╓Ё╓х╓Р╟улё╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "╔╟╔К║╪╔вл╬:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -4253,51 +4608,60 @@ msgstr ""
 "кэеЖ╓к╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╔╟╔К║╪╔в\n"
 "`%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "╨О╫Э╓╥╓ч╓╩╓С"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С(_S)"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С(_L)"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "©╥╣╛╔╟╔К║╪╔в(_N)..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "╓Ё╓н╔╟╔К║╪╔в╓Р╨О╫Э(_R)..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╔╒╔╞╔ф╔ё╔ж╓к╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "╔╒╔╞╔ф╔ё╔ж"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╔╒╔╞╔ф╔ё╔ж╓к╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╨О╫Э╓╥╓ч╓╧"
 
@@ -4305,11 +4669,11 @@ msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╨О╫Э╓╥╓ч╓╧"
 msgid "Error saving shortcuts."
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╓нйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "и╫╪╗(_V)"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "а╙бР╓╣╓Л╓©╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
 
@@ -4794,7 +5158,56 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "╦║╨В(_c)"
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "╔╟╔К║╪╔в %i"
+
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪:<br>╔╚╔Л╔С╔ю╓о╩хмяцФ╓г╓╧"
+
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "'%s' ╓н╔©╔╧╔╞╔у╔║╔╓╔К╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#~ msgid "Could not load the calendar in `%s'"
+#~ msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#~ msgid "Server disconnected."
+#~ msgstr "╔╣║╪╔п╓х╓нюэбЁ╓оюзцг╓╣╓Л╓ч╓╥╓©"
+
+#~ msgid "Save"
+#~ msgstr "йщб╦"
+
+#~ msgid "Show all hidden"
+#~ msgstr "╓╧╓ы╓ф╓нхСи╫╪╗╓Ри╫╪╗"
+
+#~ msgid "Hide read"
+#~ msgstr "╢Шфи╓Р╠ё╓╧"
+
+#~ msgid "Hide deleted"
+#~ msgstr "╨О╫Э╓Р╠ё╓╧"
+
+#~ msgid "Hide Subject"
+#~ msgstr "и╫бЙ╓Р╠ё╓╧"
+
+#~ msgid "Hide from Sender"
+#~ msgstr "╪║╓наВ©╝╪т╓Р╠ё╓╧"
+
+#~ msgid "Hide Messages"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧"
+
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "и╫бЙ \"%s\" ╓Р╠ё╓╧"
+
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "аВ©╝╪т <%s> ╓╚╓И╓Р╠ё╓╧"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "╔А║╪╔К╔╫║╪╔╧╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
diff --git a/po/ko.po b/po/ko.po
index 4a92ce5870..3de5e059af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,23 +2,194 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Young-Ho, Cha <ganadist@dacome.co.kr>, 2000.
 # update by Sung-Hyun Nam 2000/09/08
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-06 15:29+0900\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-06 15:31+0900\n"
-"Last-Translator: Young-Ho, Cha <ganadist@chollian.net\n>"
-"Language-Team: korean <ko@li.org>\n"
+"Last-Translator: Young-Ho, Cha <ganadist@chollian.net\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
+">Language-Team: korean <ko@li.org>\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution юш╪╨╠Б╟║ цй╠Бх╜╣гаЖ ╬й╬р╫ю╢о╢ы."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "╠в╥╠ ╦ч╪╪аЖ ╬Ью╫"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "╢щ╠Б"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "фЗ╢У╥н юл╣©"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "фЗ╢У ╪Ёа╓(_C)"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "╦чюофдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "©║╥╞ ╬Ью╫"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "wombat ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr ""
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Evolution юш╪╨╠Б╟║ цй╠Бх╜╣гаЖ ╬й╬р╫ю╢о╢ы."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "д╚╣Е: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,37 +197,37 @@ msgstr ""
 "\n"
 "юл╦╖: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -64,7 +235,7 @@ msgstr ""
 "\n"
 "╩Щюо: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -72,25 +243,25 @@ msgstr ""
 "\n"
 "аж╪р:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -98,7 +269,7 @@ msgstr ""
 "\n"
 "  ╫ц:          "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -106,7 +277,7 @@ msgstr ""
 "\n"
 "  аЖ©╙:        "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -114,7 +285,7 @@ msgstr ""
 "\n"
 "  ©ЛфМ ╧Ьхё:   "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -122,13 +293,13 @@ msgstr ""
 "\n"
 "  ╠╧╟║:        "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -136,7 +307,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -144,7 +315,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -152,7 +323,7 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -160,13 +331,13 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -174,21 +345,21 @@ msgstr ""
 "\n"
 "╫ц╟ё╢К: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 #, fuzzy
 msgid ""
 "\n"
 "Geo Location: "
 msgstr "ю╖д║:"
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "аВюЕ 2"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -196,7 +367,7 @@ msgstr ""
 "\n"
 "╠Б╟Э: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -204,38 +375,38 @@ msgstr ""
 "\n"
 "  юл╦╖:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "╦Я╥о"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -253,13 +424,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -267,17 +438,6 @@ msgstr ""
 "\n"
 "╟Ь©К е╟: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-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.
@@ -395,40 +555,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "wombat ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "wombatю╩ ╫цюшгр╪Ж ╬Ь╫ю╢о╢ы"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 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.
@@ -438,7 +590,7 @@ msgid "_Add"
 msgstr "цъ╟║(_A)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "╩Ха╕(_D)"
 
@@ -451,14 +603,7 @@ 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
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config-druid.glade.h:10
-#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "цъ╟║"
 
@@ -516,7 +661,6 @@ msgid "C_ontacts..."
 msgstr "©╛╤ТцЁ(_C)..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "╦Я╥о(_t)..."
 
@@ -533,7 +677,6 @@ msgid "_Address..."
 msgstr "аж╪р(_A)..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15 po/tmp/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "юо╧щ а╓╨╦"
 
@@ -578,24 +721,27 @@ msgid "No_tes:"
 msgstr "ЁКф╝(_t):"
 
 #: 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:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "а╤╪Ж"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "аВюЕ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "аВюЕ 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "аВюЕ фя╫╨"
 
@@ -604,6 +750,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "юз╣©бВ"
 
@@ -613,28 +760,33 @@ msgstr "х╦╩Г"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "аЩ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "аЩ 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "аЩ фя╫╨"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "хч╢КюЭх╜"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "╠Бе╦"
 
@@ -643,10 +795,12 @@ msgid "Other Fax"
 msgstr "╠Бе╦ фя╫╨"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "╩ъ╩ъ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr ""
 
@@ -663,62 +817,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "юл╦чюо 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "юл╦чюо 3"
 
 #.
-#. * 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:"
-
-#: 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 "╠╧╟║(_y):"
-
-#: 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 "аж╪р(_A):"
-
-#: po/tmp/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "╫ц(_C):"
-
-#: 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.
@@ -772,12 +880,7 @@ msgstr ""
 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:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -802,27 +905,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "╦П╣н ╨╦╠Б"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "╟М╠ч..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "фЗ╢У е╫╩Ж╠Б╟║ г╔╫цгр URI"
 
@@ -847,9 +950,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "╨Я╧п╧Ьхё"
 
@@ -883,12 +986,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr "хё╫╨ф╝:"
 
@@ -906,12 +1007,10 @@ msgid "Search Scope:"
 msgstr "╟к╩Ж"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943 po/tmp/mail-config-druid.glade.h:14
 msgid "Authentication:"
 msgstr "юнаУ:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934 po/tmp/mail-config-druid.glade.h:52
 msgid "Path:"
 msgstr "╟Ф╥н:"
 
@@ -934,190 +1033,89 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "юл╦╖:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "╪Ё╦М:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:685 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:12
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
-#: po/tmp/mail-config-druid.glade.h:25 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "╩Ха╕"
-
-#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config-druid.glade.h:29
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "фМаЩ"
-
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "юл╦╖"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-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
-#, fuzzy
-msgid "Select name from:"
-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 ""
-
-#: 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 ""
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "VCard╥н юЗюЕ"
 
-#: po/tmp/alphabet.glade.h:20
-msgid "n"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "юл╦╖"
 
-#: po/tmp/alphabet.glade.h:21
-msgid "o"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "юл╦чюо 2"
 
-#: po/tmp/alphabet.glade.h:22
-msgid "p"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "а╤аВ"
 
-#: po/tmp/alphabet.glade.h:23
-msgid "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:24
-msgid "r"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "╨н╪╜(_D):"
 
-#: po/tmp/alphabet.glade.h:25
-msgid "s"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "╩Г╧╚╫г(_O):"
 
-#: po/tmp/alphabet.glade.h:26
-msgid "t"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "а╕╦Я(_T):"
 
-#: po/tmp/alphabet.glade.h:27
-msgid "u"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "аВ╬В(_P):"
 
-#: po/tmp/alphabet.glade.h:28
-msgid "v"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "╩ъ╩ъ"
 
-#: po/tmp/alphabet.glade.h:29
-msgid "w"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "╨╟╦М(_N):"
 
-#: po/tmp/alphabet.glade.h:30
-msgid "x"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "╧Х©Люз(_S):"
 
-#: po/tmp/alphabet.glade.h:31
-msgid "y"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "ЁКф╝(_t):"
 
-#: po/tmp/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard╥н юЗюЕ"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "аж╪р╥о©║ юЗюЕ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1126,178 +1124,6 @@ msgid ""
 "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 "10 фВюнф╝ Tahoma"
-
-#: po/tmp/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 фВюнф╝ Tahoma"
-
-#: 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
-msgid "Format"
-msgstr "гЭ╫д"
-
-#: 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
-msgid "Portrait"
-msgstr "╪╪╥н"
-
-#: 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
-msgid "Size:"
-msgstr "е╘╠Б:"
-
-#: 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
-msgid "Top:"
-msgstr "ю╖:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config-druid.glade.h:75
-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 ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution ╢ч╥б ╨нг╟"
@@ -1306,13 +1132,13 @@ msgstr "Evolution ╢ч╥б ╨нг╟"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Evolution ╢ч╥б ╨нг╟©К ╪Ёа╓ ╣╣╠╦.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1324,30 +1150,45 @@ msgstr "Evolution гь╬ъгрюо ╨нг╟"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Evolution гь╬ъгрюо ╨нг╟ ╪Ёа╓ ╣╣╠╦.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify.c:876
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "х╝юн"
+
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "фдюоюл ╧ъ╟ъ╣гаЖ ╬й╬р╫ю╢о╢ы"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "╢ч╥б ©╜╠Б"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "╢ч╥б юЗюЕ"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1355,57 +1196,57 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:352 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "╨о"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "Ё╡"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "╣©"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "╪╜"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1414,7 +1255,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1422,761 +1263,423 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 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 "╢ч╥бюл г╔╫цгр URI"
-
-#: 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
-msgid "Edit appointment"
-msgstr "╬Ю╪сю╩ ╪Жа╓го╠Б"
-
-#: 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 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:"
+#: calendar/gui/calendar-summary.c:97
+msgid "%A, %e %B %Y"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
-msgid "Fri"
-msgstr "╠щ"
-
-#: calendar/gui/event-editor.c:433 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:429 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:31 po/tmp/cal-prefs-dialog.glade.h:39
-msgid "Priority"
-msgstr "©Л╪╠╪Ью╖"
+#: calendar/gui/calendar-summary.c:302
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
+#: calendar/gui/calendar-summary.c:314
+msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
+#: calendar/gui/calendar-summary.c:484
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
-msgid "Sat"
-msgstr "еД"
-
-#: calendar/gui/event-editor.c:434 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"
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
 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:435 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "юо©Дюо"
-
-#: 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 "╦Я"
-
-#: calendar/gui/event-editor.c:432 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/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
-msgid "Tue"
-msgstr "х╜"
+#: calendar/gui/calendar-summary.c:583
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "╢ч╥б ╩Г©Кго╠Б(_C)"
 
-#: calendar/gui/event-editor.c:430 po/tmp/cal-prefs-dialog.glade.h:57
-msgid "Tuesday"
-msgstr "х╜©Дюо"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
+msgstr "╢ч╥бюл г╔╫цгр URI"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
-msgid "Wed"
-msgstr "╪Ж"
-
-#: calendar/gui/event-editor.c:431 po/tmp/cal-prefs-dialog.glade.h:60
-msgid "Wednesday"
-msgstr "╪Ж©Дюо"
-
-#: po/tmp/cal-prefs-dialog.glade.h:61
-msgid "Work week"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "цй."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "а╓╦╩╥н ╬Ю╪с `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "а╓╦╩╥н юл а╕╦Я╬Ь╢б ╬Ю╪сю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "а╓╦╩╥н юл а╕╦Я╬Ь╢б юш╬Вю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "а╓╦╩╥н ©╘гЮюоа╓ `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 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 "% ©о╥А(_p):"
-
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "╨п╥Ы(_l):"
-
-#: po/tmp/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "цК╪р╣й"
-
-#: po/tmp/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "©о╥А╣й"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
+msgstr "юш╬В фМаЩ"
 
-#: po/tmp/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:14
-msgid "High"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "╬Ю╪с - %s"
+
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "аЬгЮаъ"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
+msgstr "©╘гЮ юоа╓ - %s"
 
-#: po/tmp/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
+msgstr "╨╞╟Ф╣х╟мю╩ юЗюЕ го╠Ф ©Ьго╫й╢о╠Н?"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: po/tmp/mail-config-druid.glade.h:47 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "╦Я╥о"
 
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "╨╦еК"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "╨п╥Ы"
 
-#: po/tmp/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "©о╥А╣й"
 
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "©Д╬Ю(_u)"
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Ё╙аъ©║ ╨╦Ё©(_L)"
 
-#: po/tmp/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
 msgstr "╫цюш Ё╞б╔(_r):"
 
-#: po/tmp/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "юш╬В"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "©╛╤ТцЁ(_C)..."
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "©Л╪╠╪Ью╖(_P):"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "╩Себ(_S):"
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "юш╬Вюл ©о╥А╣г╬Зю╫ю╩ г╔╫ц"
 
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "©Л╪╠╪Ью╖"
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr "юш╬В фМаЩ"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "©Д╬Ю(_u)"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
-msgstr "╬Ю╪с - %s"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
-msgstr "©╘гЮ юоа╓ - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
-msgstr "╨╞╟Ф╣х╟мю╩ юЗюЕ го╠Ф ©Ьго╫й╢о╠Н?"
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "©╜╠Б..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "©о╥А г╔╫ц"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "юш╬Вюл ©о╥А╣г╬Зю╫ю╩ г╔╫ц"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "╩Ха╕"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "©ююЭ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "©юхд"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "╩У ╬Ю╪с"
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "гЖюГ ╬Ю╪сю╩ ╪Жа╓гу╢о╢ы..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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
-msgid "Appointment Basics"
-msgstr ""
-
-#: 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
-msgid "Pri_vate"
-msgstr ""
-
-#: 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"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 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 "╫цюш ╫ц╟ё(_S):"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr "╦Я╥о"
 
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "╫цюш Ё╞б╔(_S):"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "`%s'©║╪╜ ╢ч╥бю╩ ╦╦╣И╪Ж ╬Ь╫ю╢о╢ы"
 
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "day(s)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
 
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/event-editor.c:409
+msgid "on"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "©Ы©Дюо"
 
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "х╜©Дюо"
 
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "╪Ж©Дюо"
 
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr ""
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "╦Я©Дюо"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "╠щ©Дюо"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr ""
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "еД©Дюо"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr ""
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "юо©Дюо"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr "юс╫ц фЗ╢У╦╕ ╢щю╩╪Ж ╬Ью╫: %s"
+
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "Could not load the calendar in `%s'"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "`%s'©║╪╜ ╢ч╥бю╩ ╦╦╣И╪Ж ╬Ь╫ю╢о╢ы"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "юо"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "©Ы"
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "х╜"
+
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "╪Ж"
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "╦Я"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "╠щ"
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "еД"
+
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "╠вЁПю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
 
@@ -2368,10 +1871,15 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "юн╪Б ╧л╦╝╨╦╠Б"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "╢ч╥бюл г╔╫цгр URI"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2462,78 +1970,86 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s ╢╨╫╨ ╪╜╧Ж %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "цК╪р╣й"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "╢ч╥б ©╜╠Б"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2549,40 +2065,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2594,25 +2111,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2620,13 +2137,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, 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)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2634,7 +2151,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2642,7 +2159,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -2969,8 +2486,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -2999,71 +2516,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "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 ""
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr ""
 
@@ -3115,121 +2631,119 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "юнаУюл гй©ДгоаЖ ╬йю╫"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: po/tmp/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ╪╜╧Ж %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3272,12 +2786,11 @@ msgid "attachment"
 msgstr "ц╥╨н"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "фдюою╩ ц╥╨нгу╢о╢ы"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "а╕╟е"
 
@@ -3293,66 +2806,50 @@ msgstr "ц╥╨нфдюо цъ╟║..."
 msgid "Attach a file to the message"
 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:6
-msgid "Attachment properties"
-msgstr "ц╥╨н ╪с╪╨"
-
-#: 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 "MIME гЭ╫д:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "╨╦Ё╫юл:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "аж╪р╥о"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "╧ч╢б╩Г╤В:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "╦ч╪╪аЖ╦╕ ╧чю╩╩Г╤Вю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╦ч╪╪аЖюг ╩Г╨╩ю╩ ╧чю╩ ╩Г╤Вюг аж╪р╦╕ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "а╕╦Я:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "фМаЖюг а╕╦Яю╩ ют╥бго╪╪©Д"
 
@@ -3363,90 +2860,86 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "юЗюЕ..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗа╓аъ..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "╦чюо ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution юш╪╨╠Б╟║ цй╠Бх╜╣гаЖ ╬й╬р╫ю╢о╢ы."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "╟к╩Ж(_c)"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
@@ -3571,7 +3064,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "╟е╦ё╟т фМаЩ"
 
@@ -3668,186 +3161,167 @@ msgstr "аъ©Д"
 msgid "Read"
 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 "after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "фВгт"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Ё╞б╔ ╧ч╬рю╫"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Ё╞б╔ ╨╦Ёбю╫"
 
-#: filter/libfilter-i18n.h:11
-msgid "does not contain"
+#: 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 "does not end with"
-msgstr ""
+msgid "Message was received"
+msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "а╦юГгоаЖ ╬йю╫"
+msgid "Message was sent"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёб╫ю╢о╢ы"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+msgid "Move to Folder"
+msgstr "фЗ╢У╥н юл╣©"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr ""
+msgid "Recipients"
+msgstr "бЭа╤юн"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "г╔гЖ"
+msgid "Sender"
+msgstr "╨╦Ё╫юл"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "юЭ╢чгр аж╪р"
+msgid "Set Status"
+msgstr "╩Себ ╪Ёа╓"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "╩Себ"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr ""
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "а╕╦Я"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
+msgid "after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
+msgid "before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёб╫ю╢о╢ы"
+msgid "contains"
+msgstr "фВгт"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "фЗ╢У╥н юл╣©"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+msgid "does not exist"
+msgstr "а╦юГгоаЖ ╬йю╫"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "бЭа╤юн"
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "╨╦Ё╫юл"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "╩Себ ╪Ёа╓"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "╩Себ"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "а╕╦Я"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3865,10 +3339,6 @@ msgstr ""
 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 ""
@@ -3877,173 +3347,165 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "юЗюЕ"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "фЗ╢У ╪╠ец"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "╨╩╧╝юлЁ╙ а╕╦Я©║ ╢ыю╫ю╩ фВгт"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "╨╩╧╝©║ ╢ыю╫ю╩ фВгт"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "а╕╦Я©║ ╢ыю╫ю╩ фВгт"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "╨╩╧╝©║ ╢ыю╫ю╩ фВгтгоаЖ ╬йю╫"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "а╕╦Я©║ ╢ыю╫ю╩ фВгтгоаЖ ╬йю╫"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "╪Ш╠Д╟м ╦П╣н ╨╦╠Б"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr ""
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr ""
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr ""
-
-#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "©╜╠Б"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "фМаЩ"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "╩У юл╦╖ю╦╥н юЗюЕ..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "юн╪Б"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "╦П╣н ╢ДюЕ"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "юЭ╢ч"
 
-#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "юпю╨ ╟мю╦╥н г╔╫ц"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "фЗ╢У╥н юл╣©..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "фЗ╢У╥н ╨╧╩Г..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "╟е╦ё╟Ё юШ©К"
 
-#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "╦ч╪╪аЖ ╪Ш╠Х"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "а╕╦Я \"%s\" ╪Ш╠Х"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr ""
 
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "╩Ха╕"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Evolution гь╬ъгрюо ╨нг╟"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4064,7 +3526,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4072,527 +3534,110 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 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 "Account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "а╓╨╦ ╬Ью╫"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "ц╥╨н ╪с╪╨"
-
-#: po/tmp/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "╟М╠ч..."
-
-#: po/tmp/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "юнаУ:"
-
-#: po/tmp/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "юнаУ:"
-
-#: po/tmp/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "╩Ха╕"
-
-#: po/tmp/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
-
-#: po/tmp/mail-config-druid.glade.h:27
-msgid "Done"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "юЭюз©ЛфМ аж╪р:"
-
-#: po/tmp/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "юЭюз©ЛфМ аж╪р:"
-
-#: po/tmp/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "╦чюо ╪Ёа╓(_M)..."
-
-#: po/tmp/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "юЭц╪юл╦╖:"
-
-#: po/tmp/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "хё╫╨ф╝:"
-
-#: po/tmp/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "фМаЖ ╧ч╠Б"
-
-#: po/tmp/mail-config-druid.glade.h:41
-msgid "Mail Account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "╦чюо ╪Ёа╓(_M)..."
-
-#: po/tmp/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "╩У╥н©Н(_N)"
-
-#: po/tmp/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "╪Ёа╓"
-
-#: mail/mail-config-gui.c:485 po/tmp/mail-config-druid.glade.h:49
-msgid "Organization:"
-msgstr "а╤аВ:"
-
-#: po/tmp/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "╨Я╧п╧Ьхё"
-
-#: po/tmp/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:55
-#, fuzzy
-msgid "Remember my password"
-msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
-
-#: mail/mail-format.c:628 po/tmp/mail-config-druid.glade.h:56
-msgid "Reply-To:"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "╢ДюЕ"
-
-#: po/tmp/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "VCard╥н юЗюЕ"
-
-#: po/tmp/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "╪╜╦М фдюо:"
-
-#: po/tmp/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ё©"
-
-#: po/tmp/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "╦чюо ╪Ёа╓(_M)..."
-
-#: po/tmp/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "╪╜╧Ж:"
-
-#: po/tmp/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "╪╜╧Ж:"
-
-#: mail/mail-config-gui.c:496 po/tmp/mail-config-druid.glade.h:69
-msgid "Signature file:"
-msgstr "╪╜╦М фдюо:"
-
-#: po/tmp/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "╪╜╦М фдюо:"
-
-#: po/tmp/mail-config-druid.glade.h:71 po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "гЭеб:"
-
-#: po/tmp/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "а╓╨╦ ╬Ью╫"
-
-#: mail/mail-config-gui.c:928 po/tmp/mail-config-druid.glade.h:77
-msgid "Username:"
-msgstr "╩Г©Кюзюл╦╖:"
-
-#: po/tmp/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:81
-msgid "minute(s)"
-msgstr ""
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "юЭц╪юл╦╖:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "юЭюз©ЛфМ аж╪р:"
-
-#: 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:956
-msgid "Detect supported types..."
-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 ""
-"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: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"
-"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
+#: mail/mail-config-druid.c:363
 #, 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 ""
-
-#: 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:12
-msgid "Mail Transport"
-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 ""
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -4627,65 +3672,65 @@ msgstr "%s©║╪╜ ©╜╠Б..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "╪Ш╠Х"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s ц╥╨н"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "╬охёх╜╣х ╦ч╪╪аЖ"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -4742,7 +3787,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -4751,160 +3796,179 @@ msgstr ""
 "фЗ╢У `%s'╦╕ ╦╦╣И╪Ж ╬Ью╫:\n"
 "%s"
 
-#: mail/mail-ops.c:88
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "юл╣©аъ"
+
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╨╦Ё╩╢б аъ"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ё©"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "╢К╠Б©╜╥н ╨╦Ё╩╢баъ"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "\"%s\"©║ ╣║╨ыюл╢баъ"
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "юл╣©аъ"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "╨╧╩Гаъ"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(╪Ё╦М ╬Ью╫)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "╣©╠Бх╜"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "\"%s\" а╕╟е аъ"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "╦ч╪╪аЖ \"%s\"╦╕ юЭ╢чгу╢о╢ы"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "╦ч╪╪аЖ ╨╧╩Г"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "%s фЗ╢У©║ юШюГаъ"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "%s фЗ╢У©║ юШюГ"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "╦ч╪╪аЖ ╨╧╩Г"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -4912,14 +3976,10 @@ msgid ""
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
 #: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "х╝юн"
-
-#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5021,111 +4081,190 @@ msgstr "╩У ╟║╩СфЗ╢У"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "╢ДюЕ"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╧чю╨ ╦П╣Г ╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "ц╥╨н"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "╨╦Ё╫юл:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "╨ыюл╠Б"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Ё╞б╔ ╧ч╬рю╫"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "╧ч╢б╩Г╤В:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "е╘╠Б:"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "фЗ╢У"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "аъаЖ"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5218,23 +4357,23 @@ msgstr ""
 msgid "New..."
 msgstr "╩У╥н©Н..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(а╕╦Я╬Ью╫)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "╫ц╫╨ешюг ╟Ф╥н©║ Bug buddy╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy╦╕ ╫ггЮгр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5244,7 +4383,7 @@ msgstr ""
 "юоа╓, ©╛╤ТцЁ ╟Э╦╝╦╕ го╢б ╠в╥Л©Ч╬Н юю©Кга╥н╠в╥╔\n"
 "╦Пю╫ ют╢о╢ы."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr ""
 
@@ -5252,13 +4391,18 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "фЗ╢У"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
 #, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s"
+msgstr ""
+
+#: shell/e-shell-view.c:1100
+#, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr ""
 
 #: shell/e-shell.c:372
@@ -5266,73 +4410,83 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "╫ц╫╨еш юЗюЕюЕд║╦╕ аЖа╓гр╪Ж ╬Ь╫ю╢о╢ы -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "╠в╥Л юл╦╖:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "юшю╨ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "е╚ ╬фюлдэ(_L)"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "е╚ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "╩У ╠в╥Л(_N)..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "╢эцЮ ╦╥╢К ╨╦╠Б(_S)"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "╢эцЮ ╦╥╢К ╨╦╠Б(_S)"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "х╟╪╨"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5340,13 +4494,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "╨╦╠Б(_V)"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
 
@@ -5458,1241 +4610,1270 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "╨╦ЁК╨╦ ддфВЁмф╝ ╫ц╫╨ешю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "╟Мд╔©╧а╓: ╩У ╬Ю╪с(_N)"
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "╟Мд╔©╧а╓: юш╬В ©Дц╩(_R)"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "цё╠Б"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-msgid "New"
-msgstr ""
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "╟Мд╔©╧а╓: юш╬В(_T)"
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "©╛╤ТцЁ╦╕ юн╪Бгу╢о╢ы"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "╟Мд╔©╧а╓: юш╬В ©Дц╩(_R)"
 
-#: po/tmp/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "аъаЖ"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "╟Мд╔©╧а╓: юБаЖ гв╦Я(_J)"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr ""
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "╟Мд╔©╧а╓: ЁКф╝(_N)"
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr ""
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "╟Мд╔©╧а╓: ╪╠ец..."
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "╦П╣Г ©╛╤ТцЁ ╨╦╠Б"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "╟Мд╔©╧а╓: ╦ч╦П гЭ╫д(_M)"
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "аж╪р╥о ╪Ёа╓(_A)..."
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "╟Мд╔©╧а╓: юн╪Б гЭ╫д а╓юг(_S)"
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "©╛╤ТцЁ╦╕ юн╪Б(_P)..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "╟Мд╔©╧а╓: ╪ш╫е(_e)"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "©╛╤ТцЁ цё╠Б(_S)"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "╟Мд╔©╧а╓: ц╥╨нфдюо юЗюЕ..."
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "╣╣╠╦(_T)"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
 
-#.
-#. * 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 "╢Е╩У╬©"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н ╨╧╩Г(_y)..."
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "бй ╪Ёа╓:"
 
-#: po/tmp/evolution-calendar.xml.h:7
-msgid "Alter preferences"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "╢ч╥б(_l)"
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "╟Мд╔©╧а╓: ц╤юз(_S)..."
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц"
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "╟Мд╔©╧а╓: гв╦Я(_I)"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr ""
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "╟Мд╔©╧а╓: фЗ╢Уюг ц╧б╟гв╦Я(_r)"
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "╟║╠Б"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "аЖа╓гя Ё╞╥н ╟║╠Б"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "╟Мд╔©╧а╓: гЭ╫д(_F)"
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "╢ч"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "юлюЭ(_v)"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "╢ыю╫"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "╢ч╥бю╩ ©╠╢о╢ы"
-
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "юлюЭ"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "╣╣╠╦(_T)"
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "юл ╢ч╥б юн╪Бго╠Б"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "╟Мд╔©╧а╓: фдюо(_F)..."
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "го╥Г╬© ╨╦╠Б"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "гя╢ч╬© ╨╦╠Б"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "╟Мд╔©╧а╓: ╠ш╡ц(_F)..."
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "гяаж╬© ╨╦╠Б"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "╟Мд╔©╧а╓: ╣╣г╔(_P)..."
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "©ю╢ц"
-
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "аж"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
-msgid "_New"
-msgstr "╩У╥н©Н(_N)"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "╢ч╥б ©╜╠Б(_O)"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "юл ╢ч╥б юн╪Б(_P)"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "╟Мд╔©╧а╓: х╔юз╦╩ ╣П╧Ж╟е(_D)"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_S)..."
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "╟Мд╔©╧а╓: ц╤юз(_S)..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "гЭ╫д(_F)"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "╩Ха╕..."
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "╣╣©Р╦╩"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "╨юеУ юн╪Б(_v)..."
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: 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:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "юн╪Б..."
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_A)..."
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "╟Мд╔©╧а╓: ц╤юз(_S)..."
 
-#: 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.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "╟Мд╔©╧а╓: юБаЖ гв╦Я(_J)"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н ╨╧╩Г(_y)..."
 
-#: 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:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
-msgid "_File"
-msgstr "фдюо(_F)"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "╟Мд╔©╧а╓: юЭ╢ч(_w)"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "юн╪Б(_P)..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "╟Мд╔©╧а╓: юЭ╢ч(_w)"
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "юЗюЕ(_S)"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "╩Пют(_I)"
 
-#.
-#. * 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-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "гЭ╫д(_o)"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "юл га╥н╠в╥╔ю╨..."
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "╣╣╠╦(_T)"
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "гЮ╣©(_n)"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "╨Я©Р(_l)"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "юлюЭ"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "юз╦ё╠Б(_u)"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "╨Я©Р"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "╟Мд╔©╧а╓: ЁКф╝(_N)"
 
-#: po/tmp/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-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:2471
+msgid "%A, %B %d, %Y"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-msgid "Copy"
-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 "╧ы╩щ"
 
-#: po/tmp/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "╪╠ецгя╟м ╨╧╩Г"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "╩Г╧╚╫г ╤╟Ё╡"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "юз╦ё╠Б"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "а╓╨╦ ╬Ью╫"
 
-#: po/tmp/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "╪╠ецгя╟м юз╦╖"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
 
-#: po/tmp/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "XML╥н ╢Щга"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "╪Ёа╓(_O)"
 
-#: po/tmp/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "╟Мд╔©╧а╓: аж╪р╥о(_B)..."
-
-#: po/tmp/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "╟Мд╔©╧а╓: ╪╠ец..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "╟Мд╔©╧а╓: юл╦╖ х╝юн(_k)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "╟Мд╔©╧а╓: фЗ╢У╥н ╨╧╩Г(_y)..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "╟Мд╔©╧а╓: юн╪Б гЭ╫д а╓юг(_S)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "╟Мд╔©╧а╓: фЗ╢Уюг ц╧б╟гв╦Я(_r)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "╟Мд╔©╧а╓: юЭ╢ч(_w)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "╟Мд╔©╧а╓: ╣╣©Р╦╩"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "х╦юг ╫цюш ╫ц╟ё(_s):"
 
-#: po/tmp/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "╟Мд╔©╧а╓: ╨р©оюЭгя еб╫╨е╘(_c)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "х╦юг а╬╥А ╫ц╟ё(_e):"
 
-#: po/tmp/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "╟Мд╔©╧а╓: фдюо ╩Пют"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "╦П╣Г бЭ╪╝юз"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+#, fuzzy
+msgid "Now"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "©ю╢ц"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "╟Мд╔©╧а╓: ╪ш╫е(_e)"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "╟к╩Ж(_c)"
 
-#: po/tmp/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "╟Мд╔©╧а╓: ц╥╨нфдюо юЗюЕ..."
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "╠в╥Л %i"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "╟Мд╔©╧а╓: х╔юз╦╩ ╣П╧Ж╟е(_D)"
+#~ msgid "Delete Contact?"
+#~ msgstr "©╛╤ТцЁ╦╕ ╩Ха╕гр╠Н©Д?"
 
-#: po/tmp/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "╟Мд╔©╧а╓: юш╬В ©Дц╩(_R)"
+#~ msgid "Address _2:"
+#~ msgstr "аж╪р _2:"
 
-#: po/tmp/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
+#~ msgid "Canada"
+#~ msgstr "дЁЁ╙╢ы"
 
-#: po/tmp/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#~ msgid "Check Address"
+#~ msgstr "аж╪р х╝юн"
 
-#: po/tmp/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "╟Мд╔©╧а╓: фдюо(_F)..."
+#~ msgid "Countr_y:"
+#~ msgstr "╠╧╟║(_y):"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "╟Мд╔©╧а╓: ╠ш╡ц(_F)..."
+#~ msgid "Finland"
+#~ msgstr "ги╤У╣Е"
 
-#: po/tmp/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "╟Мд╔©╧а╓: гЭ╫д(_F)"
+#~ msgid "USA"
+#~ msgstr "╧л╠╧"
 
-#: po/tmp/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "╟Мд╔©╧а╓: гв╦Я(_I)"
+#~ msgid "_Address:"
+#~ msgstr "аж╪р(_A):"
 
-#: po/tmp/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "╟Мд╔©╧а╓: юБаЖ гв╦Я(_J)"
+#~ msgid "_City:"
+#~ msgstr "╫ц(_C):"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "цё╠Б..."
 
-#: po/tmp/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
+#~ msgid "Message Recipients"
+#~ msgstr "╧ч╢б╩Г╤В ╦Я╥о"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "╟Мд╔©╧а╓: ╦ч╦П гЭ╫д(_M)"
+#~ msgid "Select Names"
+#~ msgstr "╪╠ецгя юл╦╖"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "╦Я╥ою╦╥н╨нем юл╦╖ю╩ ╪╠ец:"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "╟Мд╔©╧а╓: ╩У ╬Ю╪с(_N)"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 фВюнф╝ Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "╟Мд╔©╧а╓: ЁКф╝(_N)"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 фВюнф╝ Tahoma"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#~ msgid "Blank forms at end:"
+#~ msgstr "Ё║╢э ╨Я©Л╠Б:"
 
-#: po/tmp/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "╟Мд╔©╧а╓: ╣╣г╔(_P)..."
+#~ msgid "Body"
+#~ msgstr "╨╩╧╝"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "╟Мд╔©╧а╓: ц╤юз(_S)..."
+#~ msgid "Bottom:"
+#~ msgstr "╬ф╥║:"
 
-#: po/tmp/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "Font..."
+#~ msgstr "╠ш╡ц..."
 
-#: po/tmp/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "╟Мд╔©╧а╓: юш╬В(_T)"
+#~ msgid "Fonts"
+#~ msgstr "╠ш╡ц"
 
-#: po/tmp/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#~ msgid "Footer:"
+#~ msgstr "╡©╦╝╦╩:"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "Format"
+#~ msgstr "гЭ╫д"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "гЭ╫д(_o)"
+#~ msgid "Header"
+#~ msgstr "╦с╦╝╦╩:"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "╢ы╫ц цё╠Б"
+#~ msgid "Header/Footer"
+#~ msgstr "╦с╦╝╦╩/╡©╦╝╦╩"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "╢ы╫ц цё╠Б(_A)"
+#~ msgid "Headings"
+#~ msgstr "╦с╦╢╦╩"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+#~ msgid "Headings for each letter"
+#~ msgstr "╟╒ юЕ╦╤╢ы г╔а╕╢ч╠Б"
 
-#: po/tmp/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
+#~ msgid "Height:"
+#~ msgstr "ЁТюл:"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr ""
+#~ msgid "Include:"
+#~ msgstr "фВгт:"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "╢ыю╫(_e)"
+#~ msgid "Landscape"
+#~ msgstr "╟║╥н"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "╨ыюл╠Б"
+#~ msgid "Left:"
+#~ msgstr "©чбй:"
 
-#: po/tmp/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
+#~ msgid "Margins"
+#~ msgstr "©╘╧И"
 
-#: po/tmp/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "юлюЭ(_v)"
+#~ msgid "Number of columns:"
+#~ msgstr "©╜ ╪Ж:"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "юлюЭ"
+#~ msgid "Options"
+#~ msgstr "╪Ёа╓"
 
-#: po/tmp/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "юн╪Б ╪Ёа╓(_e)..."
+#~ msgid "Orientation"
+#~ msgstr "╧ФгБ"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "юн╪Б ╪Ёа╓"
+#~ msgid "Page"
+#~ msgstr "бй"
 
-#: po/tmp/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "╪Ёа╓"
+#~ msgid "Paper"
+#~ msgstr "а╬юл"
 
-#: po/tmp/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr ""
+#~ msgid "Paper source:"
+#~ msgstr "╠чаЖ╧Ф╧Щ:"
 
-#: po/tmp/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
+#~ msgid "Portrait"
+#~ msgstr "╪╪╥н"
 
-#: po/tmp/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "╧ы╡ы╠Б"
+#~ msgid "Preview:"
+#~ msgstr "╧л╦╝╨╦╠Б:"
 
-#: po/tmp/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#~ msgid "Print using gray shading"
+#~ msgstr "х╦╩Ж ╦М╬ою╦╥н юн╪Б"
 
-#: po/tmp/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+#~ msgid "Reverse on even pages"
+#~ msgstr "б╕╪Ж бй ╣заЩ╠Б"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "гЖюГ фдюою╩ юЗюЕ"
+#~ msgid "Right:"
+#~ msgstr "©ю╦╔бй:"
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#~ msgid "Sections:"
+#~ msgstr "╪╫╪г:"
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#~ msgid "Shading"
+#~ msgstr "╦М╬о"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "Start on a new page"
+#~ msgstr "╩У бйю╩ ╫цюшгу╢о╢ы"
 
-#: po/tmp/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#~ msgid "Style name:"
+#~ msgstr "гЭ╫д юл╦╖:"
 
-#: po/tmp/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#~ msgid "Top:"
+#~ msgstr "ю╖:"
 
-#: po/tmp/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "юЭ╨н ╪╠ец"
+#~ msgid "Type:"
+#~ msgstr "гЭеб:"
 
-#: po/tmp/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "юЭц╪╦╕ ╪╠ецгу╢о╢ы"
+#~ msgid "Width:"
+#~ msgstr "фЬ:"
 
-#: po/tmp/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#~ msgid "Edit appointment"
+#~ msgstr "╬Ю╪сю╩ ╪Жа╓го╠Б"
 
-#: po/tmp/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "╫ггЮцК╪р"
+#~ msgid "Calendar"
+#~ msgstr "╢ч╥б"
 
-#: po/tmp/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#~ msgid "Calendar Preferences"
+#~ msgstr "╢ч╥б ╪Ёа╓"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "юл га╥н╠в╥╔ю╨(_A)..."
+#~ msgid "Highlight"
+#~ msgstr "╟╜а╤"
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "╢щ╠Б(_C)"
+#~ msgid "Show"
+#~ msgstr "╨╦╠Б"
 
-#: po/tmp/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "╨╧╩Г(_C)"
+#~ msgid "Start of day:"
+#~ msgstr "╫цюш Ё╞б╔:"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "TaskPad"
+#~ msgstr "юш╬Вфп╣Е"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
-msgid "_Edit"
-msgstr "╪Жа╓(_E)"
+#~ msgid "seconds."
+#~ msgstr "цй."
 
-#: po/tmp/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "цё╠Б(_F)..."
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ©о╥А(_p):"
 
-#: po/tmp/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "гЭ╫д(_F)"
+#~ msgid "C_lassification:"
+#~ msgstr "╨п╥Ы(_l):"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
-msgid "_Help"
-msgstr "╣╣©Р╦╩(_H)"
+#~ msgid "In Progress"
+#~ msgstr "аЬгЮаъ"
 
-#: po/tmp/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "╩Пют(_I)"
+#~ msgid "Normal"
+#~ msgstr "╨╦еК"
 
-#: po/tmp/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr ""
+#~ msgid "Task"
+#~ msgstr "юш╬В"
 
-#: po/tmp/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "╨ыюл╠Б(_P)"
+#~ msgid "_Contacts..."
+#~ msgstr "©╛╤ТцЁ(_C)..."
 
-#: po/tmp/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "юн╪Б(_P)"
+#~ msgid "_Priority:"
+#~ msgstr "©Л╪╠╪Ью╖(_P):"
 
-#: po/tmp/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "╪Ёа╓(_P)..."
+#~ msgid "_Status:"
+#~ msgstr "╩Себ(_S):"
 
-#: po/tmp/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "юГ╫ггЮ(_R)"
+#~ msgid "Modify"
+#~ msgstr "╪Жа╓"
 
-#: po/tmp/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "╧ы╡ы╠Б(_R)..."
+#~ msgid "Preview"
+#~ msgstr "╧л╦╝╨╦╠Б"
 
-#: po/tmp/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "╣╣╠╦(_T)"
+#~ msgid "_Start time:"
+#~ msgstr "╫цюш ╫ц╟ё(_S):"
 
-#: po/tmp/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "╫ггЮцК╪р(_U)"
+#~ msgid "_Starting date:"
+#~ msgstr "╫цюш Ё╞б╔(_S):"
 
-#.
-#. * 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 ""
+#~ msgid "Attachment properties"
+#~ msgstr "ц╥╨н ╪с╪╨"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+#~ msgid "File name:"
+#~ msgstr "фдюо юл╦╖:"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+#~ msgid "MIME type:"
+#~ msgstr "MIME гЭ╫д:"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "фЗ╢У(_o)"
+#~ msgid "Edit VFolders"
+#~ msgstr "╟║╩СфЗ╢У фМаЩ"
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#~ msgid "Filter Rules"
+#~ msgstr "╟е╦ё╟Ё ╠тд╒"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#~ msgid "Virtual Folders"
+#~ msgstr "╟║╩С фЗ╢У"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
+#~ msgid "vFolder Sources"
+#~ msgstr "╟║╩С фЗ╢У ╪р╫╨"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "фМаЖ ╧ч╠Б"
+#~ msgid "Save"
+#~ msgstr "юЗюЕ"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
+#~ msgid "Show all hidden"
+#~ msgstr "╪Ш╠Д╟м ╦П╣н ╨╦╠Б"
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
+#~ msgid "Hide Messages"
+#~ msgstr "╦ч╪╪аЖ ╪Ш╠Х"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "а╕╦Я \"%s\" ╪Ш╠Х"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "а╓╨╦ ╬Ью╫"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr "╠╦╣╤ ╟Э╦╝..."
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "ц╥╨н ╪с╪╨"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "юпю╨╟мю╦╥н г╔╫ц(_k)"
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "╟М╠ч..."
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "юпаЖ ╬йю╨╟мю╦╥н г╔╫ц(_n)"
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "юнаУ:"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "юл╣©"
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "юнаУ:"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
 
-#: po/tmp/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "╦ч╪╪аЖ юн╪Б ╧л╦╝╨╦╠Б..."
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "╦ч╪╪аЖ юн╪Б..."
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "юЭц╪юл╦╖:"
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "╦П╣н ╢ДюЕ(_A)"
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "хё╫╨ф╝:"
 
-#: po/tmp/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "фМаЖ ╧ч╠Б"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "юЭ╨н ╪╠ец(_A)"
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "╩У╥н©Н(_N)"
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr "╦П╣Г ╦ч╪╪аЖ ╨╦╠Б(_A)"
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "╪Ёа╓"
 
-#: po/tmp/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
+#~ msgid "Organization:"
+#~ msgstr "а╤аВ:"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "╨Я╧п╧Ьхё"
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Reply-to:"
+#~ msgstr "╢ДюЕ"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "╟е╦ё╟Ё юШ©К(_A)"
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "VCard╥н юЗюЕ"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "фЗ╢У ╪Ёа╓(_C)"
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "╪╜╦М фдюо:"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "фЗ╢У╥н ╨╧╩Г(_C)..."
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ё©"
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "╦ч╪╪аЖ фМаЩ(_E)"
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "а╕╟е(_E)"
+#, fuzzy
+#~ msgid "Server Type: "
+#~ msgstr "╪╜╧Ж:"
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "╪╜╧Ж:"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "юЭ╢ч(_F)"
+#~ msgid "Signature file:"
+#~ msgstr "╪╜╦М фдюо:"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "╪╠ец ╧щюЭ(_I)"
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "╪╜╦М фдюо:"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "╦чюо ╪Ёа╓(_M)..."
+#, fuzzy
+#~ msgid "Type"
+#~ msgstr "гЭеб:"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "╦ч╪╪аЖ(_M)"
+#, fuzzy
+#~ msgid "User Information"
+#~ msgstr "а╓╨╦ ╬Ью╫"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "фЗ╢У╥н юл╣©(_M)..."
+#~ msgid "Username:"
+#~ msgstr "╩Г©Кюзюл╦╖:"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "╩У ц╒©║╪╜ ©╜╠Б(_O)"
+#~ msgid "Full name:"
+#~ msgstr "юЭц╪юл╦╖:"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+#~ msgid "Email address:"
+#~ msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "╢ы╦╔ юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ(_S)..."
+#~ msgid "Signature File"
+#~ msgstr "╪╜╦М фдюо"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr ""
+#~ msgid "Server:"
+#~ msgstr "╪╜╧Ж:"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#~ msgid "Mail source type:"
+#~ msgstr "╦чюо ╪р╫╨ гЭ╫д:"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "╣г╩Л╦╡(_U)"
+#~ msgid "News source type:"
+#~ msgstr "╢╨╫╨ ╪р╫╨ гЭ╫д:"
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#~ msgid "Testing \"%s\""
+#~ msgstr "\"%s\" ╫цгХаъ"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "╟║╩С фЗ╢У фМаЩ╠Б(_V)..."
+#~ msgid "Address"
+#~ 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 "ц╥╨н"
+#~ msgid "News Servers"
+#~ msgstr "╢╨╫╨ ╪╜╧Ж"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "гЖюГ фдюо ╢щю╫"
+#~ msgid "Delete a contact"
+#~ msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "юл ╦ч╪╪аЖ╦╕ PGP╥н ╬охёх╜гу╢о╢ы"
+#~ msgid "Find"
+#~ msgstr "цё╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#~ msgid "Find a contact"
+#~ msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "╦ч╪╪аЖ©║ еь╫╨ф╝╥н фдюою╩ ╩Пютгу╢о╢ы"
+#~ msgid "Print contacts"
+#~ msgstr "©╛╤ТцЁ╦╕ юн╪Бгу╢о╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "еь╫╨ф╝ фдюо ╩Пют"
+#~ msgid "View all contacts"
+#~ msgstr "╦П╣Г ©╛╤ТцЁ ╨╦╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "фдюою╩ ©╠╢о╢ы"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "аж╪р╥о ╪Ёа╓(_A)..."
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "PGP ╬охёх╜"
+#~ msgid "_Print Contacts..."
+#~ msgstr "©╛╤ТцЁ╦╕ юн╪Б(_P)..."
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "PGP ╪╜╦М"
+#~ msgid "_Search for contacts"
+#~ msgstr "©╛╤ТцЁ цё╠Б(_S)"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ"
+#~ msgid "5 Days"
+#~ msgstr "╢Е╩У╬©"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "фЗ╢У╥н юЗюЕ(_f)... (╟Мд╔©╧а╓)"
+#~ msgid "Ca_lendar"
+#~ msgstr "╢ч╥б(_l)"
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "фЗ╢У╥н юЗюЕ..."
+#~ msgid "Create a new calendar"
+#~ msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "гЖюГ фдюою╩ ╢ы╦╔юл╦╖ю╦╥н юЗюЕгу╢о╢ы"
+#~ msgid "Go to"
+#~ msgstr "╟║╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
+#~ msgid "Go to a specific date"
+#~ msgstr "аЖа╓гя Ё╞╥н ╟║╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "╨╦Ё©"
+#~ msgid "Month"
+#~ msgstr "╢ч"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Ё╙аъ©║ ╨╦Ё©(_L)"
+#~ msgid "Open a calendar"
+#~ msgstr "╢ч╥бю╩ ©╠╢о╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Ё╙аъ©║ ╨╦Ё©(_l)"
+#~ msgid "Prev"
+#~ msgstr "юлюЭ"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
+#~ msgid "Print this calendar"
+#~ msgstr "юл ╢ч╥б юн╪Бго╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+#~ msgid "Show 1 day"
+#~ msgstr "го╥Г╬© ╨╦╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "аЖ╠щ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+#~ msgid "Show 1 month"
+#~ msgstr "гя╢ч╬© ╨╦╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ёю╢о╢ы"
+#~ msgid "Show 1 week"
+#~ msgstr "гяаж╬© ╨╦╠Б"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "ц╥╨н╧╟ ╨╦юс/╪Ш╠Х"
+#~ msgid "Week"
+#~ msgstr "аж"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
+#~ msgid "_New"
+#~ msgstr "╩У╥н©Н(_N)"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
+#~ msgid "_Open Calendar"
+#~ msgstr "╢ч╥б ©╜╠Б(_O)"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr "юл╦ч╪╪аЖ©║ PGPе╟╥н ╪╜╦Мгт"
+#~ msgid "_Print this calendar"
+#~ msgstr "юл ╢ч╥б юн╪Б(_P)"
 
-#: po/tmp/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#~ msgid "_Save As..."
+#~ msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_S)..."
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "©╜╠Б(_O)..."
+#~ msgid "Delete this item"
+#~ msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
-#: po/tmp/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr "╨╦╬х(_S)"
+#~ msgid "Delete..."
+#~ 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 ""
+#~ msgid "Help"
+#~ msgstr "╣╣©Р╦╩"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#~ msgid "Print En_velope..."
+#~ msgstr "╨юеУ юн╪Б(_v)..."
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#~ msgid "Print this item"
+#~ msgstr "юл гв╦Яю╩ юн╪Б"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#~ msgid "Print..."
+#~ msgstr "юн╪Б..."
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "╠╦╣╤"
+#~ msgid "Save _As..."
+#~ msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_A)..."
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "╠╦╣╤ аъаЖ"
+#~ msgid "Save and Close"
+#~ 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 "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
 
-#: po/tmp/evolution.xml.h:7
-msgid "E_xit"
-msgstr "а╬╥А(_x)"
+#~ msgid "See online help"
+#~ msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
+#~ msgid "_File"
+#~ msgstr "фдюо(_F)"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "га╥н╠в╥╔ю╩ ╦╤д╗╢о╢ы"
+#~ msgid "_Print..."
+#~ msgstr "юн╪Б(_P)..."
 
-#: po/tmp/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "╫цюшго╠Б"
+#~ msgid "_Save"
+#~ msgstr "юЗюЕ(_S)"
 
-#: po/tmp/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Evolutionюг а╓╨╦ ╨╦╠Б"
+#~ msgid "About this application"
+#~ msgstr "юл юю©Кга╥н╠в╥╔©║ ╢Кго©╘"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "фЗ╢У ╦╥╢К ╨╦╠Б(_F)"
+#~ msgid "About..."
+#~ msgstr "юл га╥н╠в╥╔ю╨..."
 
-#: po/tmp/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "╢эцЮ ╦╥╢К ╨╦╠Б(_S)"
+#~ msgid "C_lear"
+#~ msgstr "╨Я©Р(_l)"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "╧Ж╠в а╕╨╦(_B)"
+#~ msgid "C_ut"
+#~ msgstr "юз╦ё╠Б(_u)"
 
-#: po/tmp/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr "Bug Buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
+#~ msgid "Clear"
+#~ msgstr "╨Я©Р"
 
-#: po/tmp/evolution.xml.h:16
-#, fuzzy
-msgid "Toggle whether to show the folder bar"
-msgstr "фЗ╢У ╦╥╢К ╨╦╠Б"
+#~ msgid "Clear the selection"
+#~ msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
 
-#: po/tmp/evolution.xml.h:17
-#, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "╢эцЮ ╦╥╢К ╨╦╠Б"
+#~ msgid "Close this appointment"
+#~ msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#~ msgid "Copy"
+#~ msgstr "╨╧╩Г"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "╢ч╥б ╩Г©Кго╠Б(_C)"
+#~ msgid "Copy the selection"
+#~ msgstr "╪╠ецгя╟м ╨╧╩Г"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#~ msgid "Cut"
+#~ msgstr "юз╦ё╠Б"
 
-#: po/tmp/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "Evolutionю╨(_A)..."
+#~ msgid "Cut the selection"
+#~ msgstr "╪╠ецгя╟м юз╦╖"
 
-#: po/tmp/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
+#~ msgid "Dump XML"
+#~ msgstr "XML╥н ╢Щга"
 
-#: po/tmp/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "╟Мд╔©╧а╓: аж╪р╥о(_B)..."
 
-#: po/tmp/evolution.xml.h:26
-msgid "_Folder"
-msgstr "фЗ╢У(_F)"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "╟Мд╔©╧а╓: юл╦╖ х╝юн(_k)"
 
-#: po/tmp/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "фЗ╢У╥н ╟║╠Б(_G)..."
+#~ msgid "FIXME: Help"
+#~ msgstr "╟Мд╔©╧а╓: ╣╣©Р╦╩"
 
-#: po/tmp/evolution.xml.h:29
-msgid "_Index"
-msgstr "╩Жюн(_I)"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "╟Мд╔©╧а╓: ╨р©оюЭгя еб╫╨е╘(_c)"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "фМаЖ ╦ч╪╪аЖ(_M) (╟Мд╔©╧а╓)"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "╟Мд╔©╧а╓: фдюо ╩Пют"
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Settings"
-msgstr "╪Ёа╓(_S)"
+#~ msgid "Find Again"
+#~ msgstr "╢ы╫ц цё╠Б"
 
-#: po/tmp/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+#~ msgid "Find _Again"
+#~ msgstr "╢ы╫ц цё╠Б(_A)"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#~ msgid "N_ext"
+#~ msgstr "╢ыю╫(_e)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#~ msgid "Paste the clipboard"
+#~ msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "╧ы╩щ"
+#~ msgid "Print S_etup..."
+#~ msgstr "юн╪Б ╪Ёа╓(_e)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "╩Г╧╚╫г ╤╟Ё╡"
+#~ msgid "Print Setup"
+#~ msgstr "юн╪Б ╪Ёа╓"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "а╓╨╦ ╬Ью╫"
+#~ msgid "Properties"
+#~ msgstr "╪Ёа╓"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
+#~ msgid "Replace"
+#~ msgstr "╧ы╡ы╠Б"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "╪Ёа╓(_O)"
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#~ msgid "Save the current file"
+#~ msgstr "гЖюГ фдюою╩ юЗюЕ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#~ msgid "Select All"
+#~ msgstr "юЭ╨н ╪╠ец"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#~ msgid "Select everything"
+#~ msgstr "юЭц╪╦╕ ╪╠ецгу╢о╢ы"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr ""
+#~ msgid "Undo"
+#~ msgstr "╫ггЮцК╪р"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#~ msgid "_About..."
+#~ msgstr "юл га╥н╠в╥╔ю╨(_A)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ""
+#~ msgid "_Close"
+#~ msgstr "╢щ╠Б(_C)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#~ msgid "_Copy"
+#~ msgstr "╨╧╩Г(_C)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#~ msgid "_Edit"
+#~ msgstr "╪Жа╓(_E)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#~ msgid "_Find..."
+#~ msgstr "цё╠Б(_F)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#~ msgid "_Help"
+#~ msgstr "╣╣©Р╦╩(_H)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "х╦юг ╫цюш ╫ц╟ё(_s):"
+#~ msgid "_Paste"
+#~ msgstr "╨ыюл╠Б(_P)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "х╦юг а╬╥А ╫ц╟ё(_e):"
+#~ msgid "_Print"
+#~ msgstr "юн╪Б(_P)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "╦П╣Г бЭ╪╝юз"
+#~ msgid "_Properties..."
+#~ msgstr "╪Ёа╓(_P)..."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#~ msgid "_Redo"
+#~ msgstr "юГ╫ггЮ(_R)"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#~ msgid "_Replace..."
+#~ msgstr "╧ы╡ы╠Б(_R)..."
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr ""
+#~ msgid "_Undo"
+#~ msgstr "╫ггЮцК╪р(_U)"
+
+#~ msgid "Compose a new message"
+#~ msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+
+#~ msgid "F_older"
+#~ msgstr "фЗ╢У(_o)"
+
+#~ msgid "Get Mail"
+#~ msgstr "фМаЖ ╧ч╠Б"
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "╠╦╣╤ ╟Э╦╝..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "юпю╨╟мю╦╥н г╔╫ц(_k)"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "юпаЖ ╬йю╨╟мю╦╥н г╔╫ц(_n)"
+
+#~ msgid "Move"
+#~ msgstr "юл╣©"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "╦ч╪╪аЖ юн╪Б ╧л╦╝╨╦╠Б..."
+
+#~ msgid "Print message..."
+#~ msgstr "╦ч╪╪аЖ юн╪Б..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "╦П╣н ╢ДюЕ(_A)"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+
+#~ msgid "Select _All"
+#~ msgstr "юЭ╨н ╪╠ец(_A)"
+
+#~ msgid "Show _All messages"
+#~ msgstr "╦П╣Г ╦ч╪╪аЖ ╨╦╠Б(_A)"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "╟е╦ё╟Ё юШ©К(_A)"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "фЗ╢У╥н ╨╧╩Г(_C)..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "╦ч╪╪аЖ фМаЩ(_E)"
+
+#~ msgid "_Expunge"
+#~ msgstr "а╕╟е(_E)"
+
+#~ msgid "_Forward"
+#~ msgstr "юЭ╢ч(_F)"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "╪╠ец ╧щюЭ(_I)"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "╦чюо ╪Ёа╓(_M)..."
+
+#~ msgid "_Message"
+#~ msgstr "╦ч╪╪аЖ(_M)"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "фЗ╢У╥н юл╣©(_M)..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "╩У ц╒©║╪╜ ©╜╠Б(_O)"
+
+#~ msgid "_Print Message"
+#~ msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "╢ы╦╔ юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ(_S)..."
+
+#~ msgid "_Undelete"
+#~ msgstr "╣г╩Л╦╡(_U)"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "╟║╩С фЗ╢У фМаЩ╠Б(_V)..."
+
+#~ msgid "Attach"
+#~ msgstr "ц╥╨н"
+
+#~ msgid "Close the current file"
+#~ msgstr "гЖюГ фдюо ╢щю╫"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "юл ╦ч╪╪аЖ╦╕ PGP╥н ╬охёх╜гу╢о╢ы"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "╦ч╪╪аЖ©║ еь╫╨ф╝╥н фдюою╩ ╩Пютгу╢о╢ы"
+
+#~ msgid "Insert text file..."
+#~ msgstr "еь╫╨ф╝ фдюо ╩Пют"
+
+#~ msgid "Open a file"
+#~ msgstr "фдюою╩ ©╠╢о╢ы"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP ╬охёх╜"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP ╪╜╦М"
+
+#~ msgid "Save As"
+#~ msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "фЗ╢У╥н юЗюЕ(_f)... (╟Мд╔©╧а╓)"
+
+#~ msgid "Save in folder..."
+#~ msgstr "фЗ╢У╥н юЗюЕ..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "гЖюГ фдюою╩ ╢ы╦╔юл╦╖ю╦╥н юЗюЕгу╢о╢ы"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
+
+#~ msgid "Send"
+#~ msgstr "╨╦Ё©"
+
+#~ msgid "Send _later"
+#~ msgstr "Ё╙аъ©║ ╨╦Ё©(_l)"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
+
+#~ msgid "Send the message later"
+#~ msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#~ msgid "Send the message now"
+#~ msgstr "аЖ╠щ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#~ msgid "Send this message now"
+#~ msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ёю╢о╢ы"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "ц╥╨н╧╟ ╨╦юс/╪Ш╠Х"
+
+#~ msgid "Show _attachments"
+#~ msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "юл╦ч╪╪аЖ©║ PGPе╟╥н ╪╜╦Мгт"
+
+#~ msgid "_Open..."
+#~ msgstr "©╜╠Б(_O)..."
+
+#~ msgid "_Security"
+#~ msgstr "╨╦╬х(_S)"
+
+#~ msgid "Subscribe"
+#~ msgstr "╠╦╣╤"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "╠╦╣╤ аъаЖ"
+
+#~ msgid "Display a different folder"
+#~ msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
+
+#~ msgid "E_xit"
+#~ msgstr "а╬╥А(_x)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
+
+#~ msgid "Exit the program"
+#~ msgstr "га╥н╠в╥╔ю╩ ╦╤д╗╢о╢ы"
+
+#~ msgid "Getting _Started"
+#~ msgstr "╫цюшго╠Б"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Evolutionюг а╓╨╦ ╨╦╠Б"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "фЗ╢У ╦╥╢К ╨╦╠Б(_F)"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "╧Ж╠в а╕╨╦(_B)"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Bug Buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
 
-#: widgets/misc/e-dateedit.c:407
 #, fuzzy
-msgid "Now"
-msgstr "╩У ©╛╤ТцЁ"
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "фЗ╢У ╦╥╢К ╨╦╠Б"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#, fuzzy
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "╢эцЮ ╦╥╢К ╨╦╠Б"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#~ msgid "_About Evolution..."
+#~ msgstr "Evolutionю╨(_A)..."
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "╠в╥Л %i"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+
+#~ msgid "_Folder"
+#~ msgstr "фЗ╢У(_F)"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "фЗ╢У╥н ╟║╠Б(_G)..."
+
+#~ msgid "_Index"
+#~ msgstr "╩Жюн(_I)"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "фМаЖ ╦ч╪╪аЖ(_M) (╟Мд╔©╧а╓)"
+
+#~ msgid "_Settings"
+#~ msgstr "╪Ёа╓(_S)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
diff --git a/po/lt.po b/po/lt.po
index b3484efe39..71fdfd0a8b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Gediminas Paulauskas <menesis@delfi.lt>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6.1\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,11 +14,187 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Negaliu inicializuoti Evolution paПto komponento."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "NegalКjau inicializuoti Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox formato paПto bylos"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "NКra tokio hosto %s."
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "ParsiunХiu paПtЮ iП %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "UЧdaryti"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Perkelti А aplankЮ"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Eiti А ankstesnА daiktЮ"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Eiti А tolesnА daiktЮ"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Tvarkyti aplankЮ"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"NegalКjau atidaryti bylos %s: \n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Klaida skaitant paПto bylЮ: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "NКra klaidЬ"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Testuoti prisijungimЮ prie ╔%s╢"
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "NegalКjau prisijungti prie POP serverio %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Naujas"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Sukurti naujЮ kontaktЮ"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Negaliu inicializuoti Evolution paПto komponento."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "NegalКjau inicializuoti Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "KortelК:"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +202,7 @@ msgstr ""
 "\n"
 "Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +210,7 @@ msgstr ""
 "\n"
 "  PrieПdКlis:"
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +218,7 @@ msgstr ""
 "\n"
 "  Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +226,7 @@ msgstr ""
 "\n"
 "  Papildomas:"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +234,7 @@ msgstr ""
 "\n"
 "  PavardК:"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +242,7 @@ msgstr ""
 "\n"
 "  GalШnК:"
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +250,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +258,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,13 +266,13 @@ msgstr ""
 "\n"
 "  PaПto dКЧК:"
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +280,7 @@ msgstr ""
 "\n"
 "  GatvК:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +288,7 @@ msgstr ""
 "\n"
 "  Miestas:"
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +296,7 @@ msgstr ""
 "\n"
 "  Regionas:"
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +304,7 @@ msgstr ""
 "\n"
 "  PaПto kodas:"
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -136,13 +312,13 @@ msgstr ""
 "\n"
 "  ValstybК:"
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -150,7 +326,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -158,7 +334,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -166,7 +342,7 @@ msgstr ""
 "\n"
 "El. paПtas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -174,7 +350,7 @@ msgstr ""
 "\n"
 "El. paПtas:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -182,7 +358,7 @@ msgstr ""
 "\n"
 "PaПto programa:"
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -190,7 +366,7 @@ msgstr ""
 "\n"
 "Laiko juosta:"
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -198,7 +374,7 @@ msgstr ""
 "\n"
 "Geogr. vietovК:"
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -206,7 +382,7 @@ msgstr ""
 "\n"
 "Verslo padКtis:"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -214,7 +390,7 @@ msgstr ""
 "\n"
 "Organizacija:"
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -222,31 +398,31 @@ msgstr ""
 "\n"
 "  Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -254,7 +430,7 @@ msgstr ""
 "\n"
 "Kategorijos:"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -272,7 +448,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -280,7 +456,7 @@ msgstr ""
 "\n"
 "Unikali eilutК:"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -288,17 +464,6 @@ msgstr ""
 "\n"
 "VieПas raktas:"
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "NegalКjau inicializuoti Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -418,40 +583,32 @@ msgstr ""
 "аvyko klaida, bandant gauti pilotЬ\n"
 "sЮraПЮ iП gnome-pilot demono"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "NegalКjau Аkelti Чymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "NАekelta EBook\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "NegalКjau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "NegalКjau paleisti wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "IПtrinti kontaktЮ?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -461,7 +618,7 @@ msgid "_Add"
 msgstr "_PridКti"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_IПtrinti"
 
@@ -474,14 +631,7 @@ msgstr "TelefonЬ tipai"
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "PridКti"
 
@@ -539,7 +689,6 @@ msgid "C_ontacts..."
 msgstr "K_ontaktai..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Kategorijos..."
 
@@ -556,8 +705,6 @@ msgid "_Address..."
 msgstr "_Adresas..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Paprastai"
 
@@ -602,24 +749,27 @@ msgid "No_tes:"
 msgstr "Pas_tabos:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "IПsamiai"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Asistento"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Verslo"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Verslo 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Verslo faksas"
 
@@ -628,6 +778,7 @@ msgid "Callback"
 msgstr "Atsakiklis"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Automobilio"
 
@@ -637,28 +788,33 @@ msgstr "Kompanijos"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "NamЬ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "NamЬ 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "NamЬ faksas"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobilus"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Kitas"
 
@@ -667,10 +823,12 @@ msgid "Other Fax"
 msgstr "Kitas faksas"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "IeПkas"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Pagrindinis"
 
@@ -687,62 +845,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "El. paПtas 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "El. paПtas 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Adresas _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Patikrinti adresЮ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Valst_ybК:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Suomija"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "JAV"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Adresas:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Miestas:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_PO Box:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Valstija/Provincija:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_ZIP/PaПto kodas:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -808,12 +920,7 @@ msgstr "_GalШnК:"
 msgid "As _Minicards"
 msgstr "_MaЧos kortelКs"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "LentelК"
 
@@ -847,31 +954,31 @@ msgstr ""
 "naudoti LDAP, tu turi parsisЬsti ir Аdiegti OpenLDAP,\n"
 "o tada perkompiliuoti ir Аdiegti Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Show All"
 msgstr "Rodyti"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "Tekstas turi"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 #, fuzzy
 msgid "Name contains"
 msgstr "turi"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "turi"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kurА rodys AplankЬ narПyklК"
 
@@ -900,9 +1007,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "SlaptaЧodis"
 
@@ -938,12 +1045,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Valandos"
@@ -963,12 +1068,10 @@ msgid "Search Scope:"
 msgstr "PaieПka"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentikacija:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Kelias:"
 
@@ -994,193 +1097,90 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Vardas:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "ApraПymas:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "PridКti ПaltinА"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "IПtrinti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Taisyti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-#, fuzzy
-msgid "Name"
-msgstr "Vardas:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Rasti..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "LaiПko gavКjai"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Pasirink vardЮ iП sЮraПo:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "PaieПka"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "IПsaugoti kaip VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#, fuzzy
+msgid "Name"
+msgstr "Vardas:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "El. paПtas 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organizacija"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_Departamentas:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Ofisas:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Titulas:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Profesija:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "IeПkas"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Slapyvardis:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "S_utuoktinis:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Jokios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "IПsaugoti kaip VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "аraПyti А adresЬ knygelФ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1194,179 +1194,6 @@ msgstr ""
 "\n"
 "Dukart spragtelk, kad sukurtum naujЮ kontaktЮ."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "TuПХios formos gale:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Tekstas"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "ApaХioje:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Matavimo vienetai:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "пriftas..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "пriftai"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "PoraПtК:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Formatas"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "AntraПtК"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "AntraПtК/PoraПtК"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "AntraПtКs"
-
-#: addressbook/printing/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:20
-msgid "Height:"
-msgstr "AukПtis:"
-
-#: addressbook/printing/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:22
-msgid "Include:"
-msgstr "аtraukti:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "GulsХias lapas"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "KairКje:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "LaiПkЬ kortelКs Пone"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "ParaПtКs"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "StulpeliЬ skaiХius:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Parinktys"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Orientacija"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Puslapis"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Puslapio nuostatos:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Popierius"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Popieriaus Пaltinis:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "StaХias lapas"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "PerЧiШra:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Spausdinti naudojant pilkus ПeПКlius"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Apversti lyginiuose puslapiuose"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "DeПinКje:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sekcijos:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "пeПКliai"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Dydis:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Prasideda naujame puslapyje"
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Stiliaus vardas:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "VirПuje:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Tipas:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Plotis:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalendoriaus konduitas"
@@ -1375,13 +1202,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "аvyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -1393,73 +1220,17 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "NegalКjau perskaityti piloto ToDo programos bloko"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Kalendorius"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Negaliu inicializuoti Evolution paПto santraukos komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalendoriaus konduitas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution kalendoriaus konduito konfigШravimo Аrankis.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Priminti apie tavo АvykА"
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "UЧtildyti"
 
@@ -1469,25 +1240,25 @@ msgstr "UЧtildyti"
 msgid "Ok"
 msgstr "Gerai"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Byla nerasta"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Atidaryti kalendoriЬ"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "IПsaugoti kalendoriЬ"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1495,60 +1266,57 @@ msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "VieПas"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "AsmeniПkas"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "NeЧinomas"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "п"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Skaidrus"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Neskaidrus"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1560,7 +1328,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1568,27 +1336,27 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1598,860 +1366,423 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Svarbumas turi bШti tarp 1 ir 9 imtinai"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Klaida Аkeliant bylЮ: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Vaizdu"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Rodyti АvykiЬ pabaigos laikus"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "priedas"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, kurА rodys kalendorius"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "PaЧadinti %A, %Y %b %d, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Nepateikta santraukos."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "UЧdaryti"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Keisti АvykА"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "UЧtildymo laikas (minutКmis)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minutКs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minuХiЬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 valandЬ (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minuХiЬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 valandЬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minuХiЬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minuХiЬ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "PerspКjimai baigiasi po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "PerspКjimai garsu"
-
-#: calendar/gui/dialogs/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:16
-msgid "Calendar"
-msgstr "Kalendorius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Kalendoriaus nuostatos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Spalvos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Suspausti savaitgalius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "DatЬ navigatoriaus parinktys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "аprasta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Rodymo parinktys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Kada reikia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr "Leisti uЧtildymЮ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Dienos pabaiga:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Pirma savaitКs diena:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "Penktadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "ParyПkinti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "пiandienos Аvykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "пiandienos Аvykiai:"
-
-#: calendar/gui/dialogs/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:33
-msgid "Items Not Yet Due:"
-msgstr "аvykiai, kurie dar ne Пiandien:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Pir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "PirmadienА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "PraКjusius Аvykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "PraКjФ Аvykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Pasirink spalvЮ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Svarbumas"
-
-#: calendar/gui/dialogs/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:41
-msgid "Reminders"
-msgstr "Priminimas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "пeП"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "пeПtadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Rodyti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Rodyti АvykiЬ pabaigos laikus"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Rodyti savaiХiЬ numerius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Dienos pradЧia:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "SekmadienА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "UЧduotys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Ket"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Ketvirtadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "LikФs laikas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Laiko dalijimas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Laiko formatas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ant"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Antradienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "PerspКjimai vaizdu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Tre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "TreХiadienis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Darbo savaitК"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minutes prieП jiems Аvykstant."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "sekundЧiЬ."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Ar tikrai nori iПtrinti \n"
 "ПА kontaktЮ?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% А_vykdyta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "K_lasifikacija:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Nutraukta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "UЧbaigta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "UЧbaigimo data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "AukПtas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "Vykdoma"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "чemas"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Jokios"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normalus"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "NepradКta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "_Santrauka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "_PradЧios data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "UЧduotis"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr "_Kada reikia:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Svarbumas:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_BШsena:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Taisyti uЧduotА"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "NКra santraukos"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "аvykis -- %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "UЧduotis -- %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "чurnalo АraПas -- %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "kategorijos"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Klasifikacija"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "UЧbaigta"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "P_abaigos laikas:"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "_PradЧios data:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Kada reikia"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Svarbumas"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "_Santrauka"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Skaidrus"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "PerspКjimai"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Atidaryti..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Atidaryti uЧduotА"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "PaЧymКti uЧbaigta"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "IПtrinti"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "IПtrinti uЧduotА"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Naujas Аvykis..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Taisyti ПА АvykА..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "IПtrinti ПА АvykА"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Padaryti ПА АvykА judamu"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "IПtrinti ПА pasitaikymЮ"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "IПtrinti visus pasitaikymus"
 
-#. 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"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Vis_os dienos Аvykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "аvykio pagrindai"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Klasifikacija"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr "Kitoks pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Dienos"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Kas"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "IПimtys"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Valandos"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "SiЬsti _kam:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "MinutКs"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "Keisti"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Jokio pakartojimo"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Preview"
-msgstr "PerЧiШra:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "As_meniПkas"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "_VieПas"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "Pasikartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisyklК"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "Paprastas pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr "Sa_ntrauka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Laikas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_Garsu"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Slaptas"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_Vaizdu"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "P_abaigos laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "PaП_tu"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Programa"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "Pa_leisti programЮ:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "_PradЧios laikas:"
+msgid "Category:"
+msgstr ""
+"\n"
+"Kategorijos:"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "_PradЧios data:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Nepavyko Аkelti kalendoriaus А ╔%s╢"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dienЮ(as)"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#. 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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr "dКl"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Taisyti АvykА"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr "amЧinai"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "lygiai"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "diena"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "mКnesА(ius)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "PirmadienА"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "iki"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Antradienis"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "savaitФ(es)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "TreХiadienis"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "metus"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Ketvirtadienis"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "Taisyti АvykА"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Penktadienis"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr "lygiai"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "пeПtadienis"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "diena"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "SekmadienА"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "mКnesis"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4-a"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "kartus pasitaikys"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nepavyko Аkelti kalendoriaus А ╔%s╢"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nepavyko sukurti kalendoriaus Хia: ╔%s╢"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"NegalКjau atidaryti aplanko ╔%s╢: \n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "balandis"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "rugpjШtis"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "gruodis"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "vasaris"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "пokti А datЮ"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "пokti А ПiandienЮ"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "sausis"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "liepa"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Sek"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "birЧelis"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Pir"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "kovas"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Ant"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "PirmadienА"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Tre"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "lapkritis"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Ket"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "spalis"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Pen"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "rugsКjis"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "пeП"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "NegalКjau inicializuoti Bonobo"
@@ -2644,10 +1975,15 @@ msgstr "Esami metai (%Y)"
 msgid "Print Calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Spaudino perЧiШra"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "URI, kurА rodys kalendorius"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SPATKPп"
@@ -2738,61 +2074,69 @@ 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:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Nutraukta"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, 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:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(neЧinomas hostas)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Atidaryti kalendoriЬ"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL ╔%s╢ turi bШti su vartotojo vardu"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL ╔%s╢ turi bШti su hostu"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL ╔%s╢ turi bШti su keliu"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "NКra tokio hosto %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Laikinai negaliu paieПkoti %s hosto vardo."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui ╔%s╢ nКra tiekКjo."
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2801,17 +2145,17 @@ msgstr ""
 "NegalКjau sukurti katalogo %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL eilutКje ╔%s╢ nКra protokolo"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL eilutКje ╔%s╢ yra blogas protokolas"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Prievado numeris URL ╔%s╢ nКra skaХius."
@@ -2828,41 +2172,42 @@ msgstr "NegalКjau sukurti pipe: %s"
 msgid "Bad authentication response from server."
 msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "NeЧinoma klaida"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NetikКtas atsakymas OK iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko Аkelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "NegalКjau rasti laiПko teksto FETCH atsakyme"
 
@@ -2874,28 +2219,28 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "PaПto skaitymui ir raПymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 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:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 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:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, 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:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2905,14 +2250,14 @@ msgstr ""
 "NegalКjau autentikuotis А IMAP serverА.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "NegalКjau sukurti katalogo %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
 #, fuzzy
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr "UNIX MH formato paПto katalogai"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2920,9 +2265,8 @@ 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"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
@@ -2930,7 +2274,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3272,8 +2616,8 @@ msgid ""
 msgstr ""
 "пi parinktis autentikuosis NNTP serveryje paprasto teksto slaptaЧodЧiu."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "NegalКjau atidaryti ar sukurti .newsrc bylos, skirtos %s: %s"
@@ -3304,7 +2648,7 @@ 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Ь."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3312,7 +2656,7 @@ msgstr ""
 "п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:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3322,29 +2666,29 @@ msgstr ""
 "protokolu. Tai gali veikti nevisiems vartotojams netgi serveriuose, kurie "
 "tikina, jog Пitai palaiko."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 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:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "NegalКjau autentikuotis А KPOP serverА: %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 "NegalКjau prisijungti prie POP serverio %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3353,12 +2697,12 @@ msgstr ""
 "NegalКjau prisijungti prie POP serverio.\n"
 "Klaida siunХiant vartotojo vardЮ: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(NeЧinoma)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3366,7 +2710,7 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko norimo autentikacijos mechanizmo."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3375,13 +2719,12 @@ 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:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "NКra tokio aplanko ╔%s╢."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3430,28 +2773,23 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "PaПto siuntimas, naudojant sendmail programЮ"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
 #, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "PaПto siuntimui, prisijungiant prie nutolusio paПto serverio, naudojant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autentikacija:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3460,108 +2798,107 @@ msgstr ""
 "пi parinktis jungsis prie POP serverio, naudojant paprasto teksto "
 "slaptaЧodА. Tai vienintelК parinktis, palaikoma daugelio POP serveriЬ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "пi parinktis jungsis prie IMAP serverio, naudojant Kerberos 4 autentikacijЮ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "%s serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "PaПto siuntimas, naudojant sendmail programЮ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "NegalКjau sukurti pipe А sendmail: %s: paПtas neiПiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "NegalКjau paleisti %s: paПtas neiПiЬstas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "NegalКjau paleisti %s: paПtas neiПiЬstas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "sendmail'as baigК darbЮ su signalu %s: paПtas neiПiЬstas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "NeЧinoma klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3604,12 +2941,11 @@ msgid "attachment"
 msgstr "priedas"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Prisegti bylЮ"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "PaПalinti"
 
@@ -3625,56 +2961,40 @@ msgstr "Prisegti priedЮ..."
 msgid "Attach a file to the message"
 msgstr "Prisegti bylЮ prie Пio laiПko"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Priedo savybКs"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Bylos vardas:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "MIME tipas:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Nuo:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "аvesk laiПko gavКjus"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3682,11 +3002,11 @@ 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "аvesk laiПko temЮ"
 
@@ -3699,38 +3019,38 @@ msgstr ""
 "NegalКjau atidaryti paraПo bylos %s: \n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "IПsaugoti kaip..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida iПsaugant bylЮ: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida Аkeliant bylЮ: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "IПsaugomi laiПko pakeitimai..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "IПsaugoti laiПko pakeitimus..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Klaida saugant kШrinА А ╔JuodraПХius╢: %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3740,27 +3060,27 @@ msgstr ""
 "\n"
 "Ar norКtum iПsaugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Atidaryti bylЮ"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Tokios bylos nКra."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Tai nКra paprasta byla."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Byla yra, bet jos neАmanoma perskaityti."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ta byla atrodК pasiekiama, bet open(2) nepavyko."
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3768,27 +3088,22 @@ msgstr ""
 "Byla yra labai didelК (virП 100K).\n"
 "Ar tu tikrai nori jЮ Аterpti?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "аvyko klaida, beskaitant bylЮ."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Sukurti laiПkЮ"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Negaliu sukurti raПyklКs lango"
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "NegalКjau inicializuoti Evolution kШryklos."
 
-#: filter/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "PaieПka"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "metai"
@@ -3923,7 +3238,7 @@ msgstr ""
 "Gaunamas\n"
 "SiunХiamas\n"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Keisti filtrus"
 
@@ -4026,193 +3341,170 @@ msgstr ""
 msgid "Read"
 msgstr "Pakartoti"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Taisyti vAplankus"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filtro taisyklКs"
-
-#: filter/filter.glade.h:12
-#, fuzzy
-msgid "Incoming"
-msgstr ""
-"Gaunamas\n"
-"SiunХiamas\n"
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "KontШrai:"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "VirtualШs aplankai"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "vAplankЬ Пaltiniai"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Priskirti spalvЮ"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Priskirti АvertА"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "prieП"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "turi"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopijuoti А aplankЮ"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Siuntimo data"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "IПraiПka"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "PersiЬsti adresu"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "LaiПko tekstas"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "neturi"
+#, fuzzy
+msgid "Message Header"
+msgstr "LaiПko tekstas"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "nesibaigia"
+msgid "Message was received"
+msgstr "LaiПkas buvo gautas"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "neegzistuoja"
+msgid "Message was sent"
+msgstr "LaiПkas buvo iПsiЬstas"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "neskamba panaПiai А"
+msgid "Move to Folder"
+msgstr "Perkelti А aplankЮ"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "neprasideda"
+msgid "Recipients"
+msgstr "GavКjai"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "baigiasi"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "egzistuoja"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "аvertis"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "IПraiПka"
+msgid "Sender"
+msgstr "SiuntКjas"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "PersiЬsti adresu"
+#, fuzzy
+msgid "Set Status"
+msgstr "_BШsena:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "yra"
+msgid "Source"
+msgstr "пaltinis"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "yra didesnis uЧ"
+msgid "Specific header"
+msgstr "Savita antraПtК"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "yra maЧesnis uЧ"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_BШsena:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "nКra"
+msgid "Stop Processing"
+msgstr "Sustabdyti vykdymЮ"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "LaiПko tekstas"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Tema"
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "Message Header"
-msgstr "LaiПko tekstas"
+msgid "after"
+msgstr "po"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "LaiПkas buvo gautas"
+msgid "before"
+msgstr "prieП"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "LaiПkas buvo iПsiЬstas"
+msgid "contains"
+msgstr "turi"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Perkelti А aplankЮ"
+msgid "does not contain"
+msgstr "neturi"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "tuo metu arba po"
+msgid "does not end with"
+msgstr "nesibaigia"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "tuo metu ar prieП"
+msgid "does not exist"
+msgstr "neegzistuoja"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "neskamba panaПiai А"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "GavКjai"
+msgid "does not start with"
+msgstr "neprasideda"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "baigiasi"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "SiuntКjas"
+msgid "exists"
+msgstr "egzistuoja"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "_BШsena:"
+msgid "is greater than"
+msgstr "yra didesnis uЧ"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "skamba panaПiai А"
+msgid "is less than"
+msgstr "yra maЧesnis uЧ"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "пaltinis"
+msgid "is not"
+msgstr "nКra"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Savita antraПtК"
+msgid "is"
+msgstr "yra"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "prasideda"
+msgid "on or after"
+msgstr "tuo metu arba po"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_BШsena:"
+msgid "on or before"
+msgstr "tuo metu ar prieП"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Sustabdyti vykdymЮ"
+msgid "sounds like"
+msgstr "skamba panaПiai А"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Tema"
+msgid "starts with"
+msgstr "prasideda"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4230,10 +3522,6 @@ msgstr "PridКti taisyklФ"
 msgid "Edit Score Rule"
 msgstr "Taisyti АverХio taisyklФ"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "аvertis"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "PridКti vAplanko taisyklФ"
@@ -4242,225 +3530,173 @@ msgstr "PridКti vAplanko taisyklФ"
 msgid "Edit VFolder Rule"
 msgstr "Keisti vAplanko taisyklФ"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution paПto komponento."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Negaliu uЧregistruoti laikmenos su shell'u"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "IПsaugoti"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Parink aplankЮ"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Tekstas ar tema turi"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Tekstas turi"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Tema turi"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Tekstas neturi"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Tema neturi"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "vAplankas pagal TemЮ"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "vAplankas pagal SiuntКjЮ"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "vAplankas pagal GavКjus"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtruoti pagal TemЮ"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtruoti pagal SiuntКjЮ"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtruoti pagal GavКjus"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtruoti pagal KonferencijЮ"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Rodyti"
-
-#: mail/folder-browser.c:657
-#, fuzzy
-msgid "Hide selected"
-msgstr "IПtrintas"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "SlКpti"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "IПtrintas"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Tema"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Filtruoti pagal SiuntКjЮ"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_Atidaryti"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Taisyti"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "IПsaugoti _kaip..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Spausdinti"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Atsakyti siuntКjui"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Ats. visiems"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "PersiЬsti"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Eiti А ateities laikЮ"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 #, fuzzy
 msgid "Mark as Read"
 msgstr "PaЧymКti s_kaitytu"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "PaЧymКti _neskaityta"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Perkelti А aplankЮ"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Kopijuoti А aplankЮ"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, 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:690
+#: mail/folder-browser.c:678
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Taisyti laiПkЮ"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtruoti pagal KonferencijЮ (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Tema"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "NegalКjau paleisti wombat"
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "PaПto dКЧutКs santrauka"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Jokios"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "NaujienЬ Пaltinio tipas:"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "аprasta"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Evolution ToDo konduitas"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4482,7 +3718,7 @@ msgstr "LaiПkas nuo %s"
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4494,7 +3730,7 @@ msgstr ""
 "gauti ir raПyti laiПkus.\n"
 "Ar norКtum sutvarkyti jА dabar?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4502,7 +3738,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenybФ,\n"
 "tik tada galКsi kurti laiПkus."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4510,19 +3746,15 @@ msgstr ""
 "Tu turi sutvarkyti paПto siuntimЮ,\n"
 "tik tada galКsi kurti laiПkus."
 
-#: 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:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei paПto siuntimo metodo"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Tu nesusitvarkei Siuntimo"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4530,24 +3762,31 @@ msgstr ""
 "пis laiПkas neturi temos.\n"
 "Tikrai siЬsti?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Tu turi susitvarkyti asmenybФ,\n"
+"tik tada galКsi kurti laiПkus."
+
+#: mail/mail-callbacks.c:365
 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:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "PersiЬstas laiПkas -- %s"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Perkelti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopijuoti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4555,11 +3794,11 @@ msgstr ""
 "Tu gali taisyti tik laiПkus, esanХius \n"
 "JuodraПХiЬ aplanke."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "UЧraПyti bylЮ?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4567,17 +3806,17 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "UЧraПyti jЮ?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "IПsaugoti kaip..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "IПsaugoti kaip..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4586,477 +3825,33 @@ msgstr ""
 "Klaida, Аkeliant filtro informacijЮ:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Spausdinti laiПkЮ"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti laiПko"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "NКra informacijos"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Priedo savybКs"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Advanced"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "Autentikacija:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "Autentikacija:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "аprasta"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "NeiПtrinti laiПkЬ iП serverio"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Jokios"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "El. paПto adresas:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "El. paПto adresas:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "PaПto Nustatymas"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Pilnas vardas:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Vartotojo vardas:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "AsmenybК"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "PaП_tu"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "turi"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "PaПto Nustatymas"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "PaПto Nustatymas"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Naujas"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Parinktys"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "SlaptaЧodis"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Atsakyti-kam:"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Atsakyti-kam:"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "_Reikalingi ЧmonКs"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "IПsaugoti kaip VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "ParaПo byla:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "PaПto Nustatymas"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Serveris:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Serveris:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "ParaПo byla:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "ParaПo byla:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "пaltiniai"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Tipas:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "NКra informacijos"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Vartotojo vardas:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minuХiЬ"
-
-#: 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 ""
-"аvesk savo vardЮ ir el. paПto adresЮ, naudojamus siunХiamam paПtui. Tu taip "
-"pat gali Аvesti savo organizacijos pavadinimЮ, ir bylos vardЮ, iП kurios bus "
-"skaitomas tavo paraПas."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Pilnas vardas:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "El. paПto adresas:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "ParaПo byla"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Serveris:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "AtpaЧinti palaikomus tipus..."
-
-#: 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:1003
-msgid "Test Settings"
-msgstr "Testuoti nuostatas"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "PaПto Пaltinio tipas:"
-
-#: mail/mail-config-gui.c:1135
-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 ""
-"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:1154
-msgid "News source type:"
-msgstr "NaujienЬ Пaltinio tipas:"
-
-#: 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 ""
-"Pasirink tavo turimo naujienЬ serverio rШПА, ir Аvesk reikalingЮ informacijЮ "
-"apie jА.\n"
-"\n"
-"Jei serveris reikalauja autentikacijos, gali АvedФs kitЮ informacijЮ "
-"paspausti ╔AtpaЧinti palaikomus tipus╢ mygtukЮ."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "PaПto siuntimo tipas:"
-
-#: mail/mail-config-gui.c:1183
-#, fuzzy
+#: mail/mail-config-druid.c:363
+#, c-format
 msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Pasirink rШПА paПto serverio, kurА naudoji, ir Аvesk svarbiЮ informacijЮ "
-"apie jА.\n"
-"\n"
-"Jei serveris reikalauja tapatybКs patvirtinimo, gali paspausti ╔AtpaЧinti "
-"palaikomus tipus...╢ mygtukЮ, kai Аvesi informacijЮ."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "PridКti asmenybФ"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Taisyti asmenybФ"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "PridКti ПaltinА"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Keisti ПaltinА"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "PridКti naujienЬ serverА"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Keisti naujienЬ serverА"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Testuoju ╔%s╢"
 
-#: mail/mail-config-gui.c:2255
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Test connection to \"%s\""
-msgstr "Testuoti prisijungimЮ prie ╔%s╢"
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Prisijungimas buvo sКkmingas!"
-
-#: 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:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "UЧklausti autorizacijos pas ╔%s╢"
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adresas"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "AsmenybКs"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "PaПto Пaltiniai"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "PaПto siuntimas"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "PaЧymКti laiПkЮ skaitytu [ms]:"
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "NaujienЬ serveriai"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "NaujienЬ Пaltiniai"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organizacija"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "SiЬsti laiПkus HTML formatu"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Nepateiktas saptaЧodis."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "NКra jokios PGP/GPG programos."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "NegalКjau sukurti pipe: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5093,65 +3888,65 @@ msgstr "Atidaryti su %s..."
 msgid "View Inline"
 msgstr "чiШrКti viduje"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "IПorinК ЧiШrКklК"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "чiШrКti viduje (per %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "SlКpti"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Atsakyti-kam:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "UЧПifruotas laiПkas neparodytas"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "UЧПifruotas laiПkas"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad iППifruotum."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "RodyklК А FTP saitЮ (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "RodyklК А vietinФ bylЮ (%s), galiojanti saite ╔%s╢"
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "RodyklК А vietinФ bylЮ (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "RodyklК А neЧinomus iПorinius duomenis (╔%s╢ tipo)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota iПorinio kШno dalis."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5214,7 +4009,7 @@ msgstr "Kuriamas naujas aplankas"
 msgid "Register local folder"
 msgstr "Sukurti naujЮ aplankЮ"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5244,161 +4039,161 @@ msgstr ""
 msgid "Working"
 msgstr "Perkeliu"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "ParsiunХiu paПtЮ iП %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "ParsiЬsti paПtЮ iП %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "NКra naujЬ laiПkЬ serveryje %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtruoju el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtruoti el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "SiunХiu ╔%s╢"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "IПtrinti ПА laiПkЮ"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "SiunХiu iП eilКs"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "SiЬsti iП eilКs"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Prijungiu ╔%s╢"
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Prijungiu laiПkЮ be temos"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Perkeliami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopijuojami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Perkelti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopijuoti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Perkeliu"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopijuoju"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s laiПkЮ %d iП %d (uid ╔%s╢)"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(NКra apraПymo)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "PersiЬstas laiПkas -- %s"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sinchronizuoju ╔%s╢"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "IПvaloma ╔%s╢"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunami laiПki: %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Gaunami laiПki: %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "аkeliamas %s aplankas"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "аkelti %s aplankЮ"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Kopijuojami laiПkai"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Negaliu iПsaugoti grupЬ sЮraПo bylos dКl %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gaunamas laiПkas %d  iП %d (uid ╔%s╢)"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5409,7 +4204,7 @@ msgstr "Klaida iПsaugant bylЮ: %s"
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Nepilnas laiПkas suraПytas А pipe!"
 
@@ -5519,117 +4314,196 @@ msgstr "Naujas vAplankas"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Atsakyti Пio laiПko siuntКjui"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Atsakyti visiems Пio laiПko gavКjams"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "PersiЬsti ПА laiПkЮ"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Spausdinti parinktЮ laiПkЮ"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "IПtrinti ПА laiПkЮ"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Atsakyti"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "NeЧinomas"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Svarbus"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "priedas"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "Nuo:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Kada reikia"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Gavimo data"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Kam:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Dydis:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "PraПom Аvesti NNTP slaptaЧodА vartotojui %s@%s"
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "NКra jokios PGP/GPG programos."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Nepateiktas saptaЧodis."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "NegalКjau sukurti pipe: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Aplankai"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "аvertis"
+
+#: mail/subscribe-dialog.c:145
 #, fuzzy
 msgid "Display folders starting with:"
 msgstr "Rodyti aplankus, turinХius:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Skaityti aplankus iП ╔%s╢"
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
@@ -5738,23 +4612,24 @@ msgstr ""
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalКjo bШti paleistas."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5764,7 +4639,7 @@ msgstr ""
 "paПtui, kalendoriams ir kontaktЬ tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Eiti А aplankЮ..."
 
@@ -5772,13 +4647,18 @@ msgstr "Eiti А aplankЮ..."
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Aplankai"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution -- %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution -- %s"
 
 #: shell/e-shell.c:372
@@ -5786,7 +4666,7 @@ msgstr "Evolution -- %s"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5795,15 +4675,15 @@ msgstr ""
 "Uoj!  Vaizdas, skirtas ╔%s╢ netikКtai numirК.  :-(\n"
 "Tikriausiai tai reiПkia, kad %s komponentas nulШЧo."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Sukurti naujЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "GrupКs vardas:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5812,51 +4692,61 @@ msgstr ""
 "Ar tu tikrai nori paПalinti grupФ\n"
 "╔%s╢ iП trumpiЬ juostos?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "NepaПalinti"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_MaЧos ikonos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip maЧas ikonas"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_DidelКs ikonos"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nauja grupК..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Sukurti naujЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_PaПalinti ПiЮ grupФ..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Rodyti _TrumpiЬ juostЮ"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Rodyti _TrumpiЬ juostЮ"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "SuЧadinti"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "SuЧadinti ПiЮ trumpФ"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
 
@@ -5864,12 +4754,11 @@ msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
 msgid "Error saving shortcuts."
 msgstr "Klaida iПsaugant trumpes."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Rodinys"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Rodyti parinktЮ aplankЮ"
 
@@ -5964,1275 +4853,2024 @@ msgstr "UЧdraustas"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "NegalКjau inicializuoti Bonobo komponentЬ sistemos."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Sukurti naujЮ kontaktЮ"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Naujas Аvykis..."
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "IПtrinti kontaktЮ"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "UЧduoties _praПymas"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Rasti"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "_SiЬsti laiПkЮ"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Rasti kontaktЮ"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "_Kontaktas"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Naujas"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "_UЧduotis"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Spausdinti kontaktus"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "UЧduoties _praПymas"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Stop"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "_чurnalo АraПas"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Sustabdyti АkКlimЮ"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "_Pastaba"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Rodyti visus"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "Pasirinkti _formЮ..."
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Rodyti visus kontaktus"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "_Memo stilius"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "_PaПto nustatymas...."
+msgid "FIXME: Define Print _Styles..."
+msgstr "ApibrКЧti spausdinimo s_tilius"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "S_pausdinti kontaktus..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "SiЬs_ti"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_IeПkoti kontaktЬ"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "_IПsaugoti priedus..."
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "аran_kiai"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "Perke_lti А aplankЮ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 Dienos"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Kopi_juoti А aplankЮ"
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Puslapio nuostatos:"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Sutvarkyti kalendoriЬ"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "Spaudinio perЧi_Шra"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Kalendorius"
+msgid "FIXME: Paste _Special..."
+msgstr "_RaПyba..."
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Kalendoriaus nuostatos..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "PaЧymКti _neskaityta"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Sukurti naujЮ АvykА"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objektas"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Sukurti naujЮ kalendoriЬ"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "_Daiktas"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Diena"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "_Neskaitytas daiktas"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Eiti А ankstesnА laikЮ"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "_Pirmas daiktas aplanke"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Eiti А ateities laikЮ"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "P_askutinis daiktas aplanke"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "пokti"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "_StandartinК"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "пokti А nurodytЮ datЮ"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "_Formatavimo"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Eiti А dabartinА laikЮ"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "_Prisitaikyti..."
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "MКnesis"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Ankstesnis"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "Pirmyn"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Atidaryti kalendoriЬ"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "а_rankiЬ juostos"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Atgal"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "_BylЮ..."
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Spausdinti ПА kalendoriЬ"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "_DaiktЮ..."
 
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Save calendar as something else"
-msgstr "_IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "_ObjektЮ..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "_пriftas..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "_Pastraipa..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Rodyti 1 dienЮ"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Rodyti 1 mКnesА"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "_Skelbti formЮ..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Rodyti 1 savaitФ"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "S_kelbti formЮ kaip..."
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Rodyti darbo savaitФ"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Dabar"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "_RaПyba..."
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "SavaitК"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formos"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Naujas"
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Kontaktas"
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_Atidaryti kalendoriЬ"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "S_pausdinti ПА kalendoriЬ"
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Kontaktas"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml:146
 #, fuzzy
-msgid "_Save As..."
-msgstr "IПsaugoti _kaip..."
+msgid "FIXME: New _Message to Contact"
+msgstr "SiЬsti laiПkЮ be temos"
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "IПtrinti ПА daiktЮ"
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Kontaktas"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "Delete..."
-msgstr "IПtrinti"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_RaПyba..."
 
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml:149
 #, fuzzy
-msgid "Help"
-msgstr "_Pagalba"
+msgid "FIXME: New _Task for Contact"
+msgstr "_Kontaktas"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml:150
 #, fuzzy
-msgid "Print En_velope..."
-msgstr "Spausdinimo _nuostatos...."
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "_чurnalo АraПas"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Spausdinti ПА daiktЮ"
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Kopi_juoti А aplankЮ"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Spausdinti..."
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "_SiЬsti laiПkЮ"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "IПsaugoti _kaip..."
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "_SiЬsti laiПkЮ"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "IПsaugoti ir uЧdaryti"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "PersiЬsti kaip v_Calendar"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "IПsaugoti kontaktЮ ir uЧdaryti dialogo langЮ"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "Per_siЬsti"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "аterpt_i"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Rodyti ЧinynЮ"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormatas"
 
-#: ui/evolution-contact-editor.xml.h:18
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "SiЬsti laiПkЮ be temos"
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "аran_kiai"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Byla"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "_Veiksmai"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml:246
 #, fuzzy
-msgid "_Print..."
-msgstr "Spausdinti..."
+msgid "FIXME: Previous"
+msgstr "Ankstesnis"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "IП_saugoti"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Eiti А ankstesnА daiktЮ"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "Apie ПiЮ aplikacijЮ"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "_Pastaba"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Apie..."
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Eiti А tolesnА daiktЮ"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "_Veiksmai"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "IПva_lyti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Bandymas"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "_IПkirpti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "UЧimtas"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "IПvalyti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Nesu darbe"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "IПvalyti paЧymКjimЮ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "NКra informacijos"
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "UЧdaryti ПА АvykА"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "Pakv_iesti kitus..."
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopijuoti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Parinktys"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Kopijuoti paЧymКjimЮ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Rodyti tik _darbo valandas"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "IПkirpti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Rodyti _atitrauktЮ"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "IПkirpti paЧymКjimЮ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Atnaujinti Laisvas/UЧimtas"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "_AdresЬ knygelК..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "Pasirinkti _formЮ..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Visi ЧmonКs ir resursai"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "_Tikrinti vardus"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Visi Ч_monКs ir vienas resursas"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopi_juoti А aplankЮ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Reikalingi ЧmonКs"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Reikalingi ЧmonКs ir _vienas resursas"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "ApibrКЧti spausdinimo s_tilius"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Susitikimo _pradЧios laikas:"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Susitikimo pa_baigos laikas:"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "_Pirmas daiktas aplanke"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Visi dalyviai"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "Per_siЬsti"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "PATKPпS"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "PersiЬsti kaip v_Calendar"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "Pagalba"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "Ne_baigta uЧduotis"
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Dabar"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "аterpti bylЮ"
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Dabar"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "_DaiktЮ..."
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "Spaudinio perЧi_Шra"
+#: widgets/misc/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "PaieПka"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "S_kelbti formЮ kaip..."
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "GrupК %i"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "_Skelbti formЮ..."
+#~ msgid "Delete Contact?"
+#~ msgstr "IПtrinti kontaktЮ?"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "Pasi_kartojimas"
+#~ msgid "Address _2:"
+#~ msgstr "Adresas _2:"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "SiЬs_ti"
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "_IПsaugoti priedus..."
+#~ msgid "Check Address"
+#~ msgstr "Patikrinti adresЮ"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#~ msgid "Countr_y:"
+#~ msgstr "Valst_ybК:"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "UЧduoties _praПymas"
+#~ msgid "Finland"
+#~ msgstr "Suomija"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "_Kontaktas"
+#~ msgid "USA"
+#~ msgstr "JAV"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "_Prisitaikyti..."
+#~ msgid "_Address:"
+#~ msgstr "_Adresas:"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "_BylЮ..."
+#~ msgid "_City:"
+#~ msgstr "_Miestas:"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "_пriftas..."
+#~ msgid "_PO Box:"
+#~ msgstr "_PO Box:"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "_Formatavimo"
+#~ msgid "_State/Province:"
+#~ msgstr "_Valstija/Provincija:"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "_Daiktas"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_ZIP/PaПto kodas:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "_чurnalo АraПas"
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "PridКti ПaltinА"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "P_askutinis daiktas aplanke"
+#~ msgid "Find..."
+#~ msgstr "Rasti..."
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "_SiЬsti laiПkЮ"
+#~ msgid "Message Recipients"
+#~ msgstr "LaiПko gavКjai"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "_Memo stilius"
+#~ msgid "Select Names"
+#~ msgstr "Pasirink vardus"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "Perke_lti А aplankЮ..."
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "Pasirink vardЮ iП sЮraПo:"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "_Naujas Аvykis..."
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "_Pastaba"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "_ObjektЮ..."
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "_Pastraipa..."
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "_RaПyba..."
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "_StandartinК"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "_UЧduotis"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "_Neskaitytas daiktas"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr "o kas Хia dabar?"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormatas"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Rasti vКl"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Rasti _vКl"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Eiti А tolesnА daiktЮ"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Eiti А ankstesnА daiktЮ"
+#~ msgid "m"
+#~ msgstr "m"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Pakeisti bylos savybes"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "_Tolesnis"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "аdКti"
+#~ msgid "p"
+#~ msgstr "p"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "аdКti iП krepПio"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Ankstesnis"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Ankstesnis"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Spausdinimo _nuostatos...."
+#~ msgid "t"
+#~ msgstr "t"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Puslapio nuostatos"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "SavybКs"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Pakartoti"
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "TuПХios formos gale:"
+
+#~ msgid "Body"
+#~ msgstr "Tekstas"
+
+#~ msgid "Bottom:"
+#~ msgstr "ApaХioje:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Matavimo vienetai:"
+
+#~ msgid "Font..."
+#~ msgstr "пriftas..."
+
+#~ msgid "Fonts"
+#~ msgstr "пriftai"
+
+#~ msgid "Footer:"
+#~ msgstr "PoraПtК:"
+
+#~ msgid "Format"
+#~ msgstr "Formatas"
+
+#~ msgid "Header"
+#~ msgstr "AntraПtК"
+
+#~ msgid "Header/Footer"
+#~ msgstr "AntraПtК/PoraПtК"
+
+#~ msgid "Headings"
+#~ msgstr "AntraПtКs"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Pakartoti atПauktЮ veiksmЮ"
+#~ msgid "Headings for each letter"
+#~ msgstr "AntraПtКs kiekvienam laiПkui"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Pakeisti"
+#~ msgid "Height:"
+#~ msgstr "AukПtis:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Pakeisti eilutФ"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Seka iПkart vienas po kito"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
+#~ msgid "Include:"
+#~ msgstr "аtraukti:"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "IПsaugoti esamЮ bylЮ"
+#~ msgid "Landscape"
+#~ msgstr "GulsХias lapas"
+
+#~ msgid "Left:"
+#~ msgstr "KairКje:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "LaiПkЬ kortelКs Пone"
+
+#~ msgid "Margins"
+#~ msgstr "ParaПtКs"
+
+#~ msgid "Number of columns:"
+#~ msgstr "StulpeliЬ skaiХius:"
+
+#~ msgid "Options"
+#~ msgstr "Parinktys"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientacija"
+
+#~ msgid "Page"
+#~ msgstr "Puslapis"
+
+#~ msgid "Paper"
+#~ msgstr "Popierius"
+
+#~ msgid "Paper source:"
+#~ msgstr "Popieriaus Пaltinis:"
+
+#~ msgid "Portrait"
+#~ msgstr "StaХias lapas"
+
+#~ msgid "Preview:"
+#~ msgstr "PerЧiШra:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Spausdinti naudojant pilkus ПeПКlius"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Apversti lyginiuose puslapiuose"
+
+#~ msgid "Right:"
+#~ msgstr "DeПinКje:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sekcijos:"
+
+#~ msgid "Shading"
+#~ msgstr "пeПКliai"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Prasideda naujame puslapyje"
+
+#~ msgid "Style name:"
+#~ msgstr "Stiliaus vardas:"
+
+#~ msgid "Top:"
+#~ msgstr "VirПuje:"
+
+#~ msgid "Type:"
+#~ msgstr "Tipas:"
+
+#~ msgid "Width:"
+#~ msgstr "Plotis:"
+
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
-msgid "Schedule Meeting"
-msgstr "аraПyti susitikimЮ А dienotvarkФ"
+#~ msgid "Calendar Server"
+#~ msgstr "Kalendorius"
 
-#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Negaliu inicializuoti Evolution paПto santraukos komponento."
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution kalendoriaus konduitas"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "VКl ieПkoti tos paХios eilutКs"
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Evolution kalendoriaus konduito konfigШravimo Аrankis.\n"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "IeПkoti eilutКs"
+#~ msgid "Edit appointment"
+#~ msgstr "Keisti АvykА"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "PaЧymКti visЮ"
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "UЧtildymo laikas (minutКmis)"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "PaЧymКti viskЮ"
+#~ msgid "05 minutes"
+#~ msgstr "05 minutКs"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+#~ msgid "10 minutes"
+#~ msgstr "10 minuХiЬ"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "AtПaukti"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 valandЬ (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "AtПaukti paskutinА veiksmЮ"
+#~ msgid "15 minutes"
+#~ msgstr "15 minuХiЬ"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_Apie..."
+#~ msgid "24 hour"
+#~ msgstr "24 valandЬ"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "U_Чdaryti"
+#~ msgid "30 minutes"
+#~ msgstr "30 minuХiЬ"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Kopijuoti"
+#~ msgid "60 minutes"
+#~ msgstr "60 minuХiЬ"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr "_Derinti"
+#~ msgid "Alarms timeout after"
+#~ msgstr "PerspКjimai baigiasi po"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Taisa"
+#~ msgid "Audio Alarms"
+#~ msgstr "PerspКjimai garsu"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Rasti..."
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "PyptelКti, kai atsiranda aliarmo langai."
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formos"
+#~ msgid "Calendar"
+#~ msgstr "Kalendorius"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Pagalba"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalendoriaus nuostatos"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "аterpt_i"
+#~ msgid "Colors"
+#~ msgstr "Spalvos"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objektas"
+#~ msgid "Compress weekends"
+#~ msgstr "Suspausti savaitgalius"
 
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "а_dКti"
+#~ msgid "Date navigator options"
+#~ msgstr "DatЬ navigatoriaus parinktys"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "S_pausdinti"
+#~ msgid "Defaults"
+#~ msgstr "аprasta"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_SavybКs..."
+#~ msgid "Display options"
+#~ msgstr "Rodymo parinktys"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "Paka_rtoti"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Leisti uЧtildymЮ"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Pakeisti..."
+#~ msgid "End of day:"
+#~ msgstr "Dienos pabaiga:"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "а_rankiЬ juostos"
+#~ msgid "First day of week:"
+#~ msgstr "Pirma savaitКs diena:"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_AtПaukti"
+#~ msgid "Highlight"
+#~ msgstr "ParyПkinti"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Sukurti"
+#~ msgid "Items Due Today"
+#~ msgstr "пiandienos Аvykius"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "пiandienos Аvykiai:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "аvykius, kurie dar ne Пiandien"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "аvykiai, kurie dar ne Пiandien:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "PraКjusius Аvykius"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "PraКjФ Аvykiai:"
+
+#~ msgid "Pick a color"
+#~ msgstr "Pasirink spalvЮ"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Priminti man apie visus Аvykius"
+
+#~ msgid "Reminders"
+#~ msgstr "Priminimas"
+
+#~ msgid "Show"
+#~ msgstr "Rodyti"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Rodyti savaiХiЬ numerius"
+
+#~ msgid "Start of day:"
+#~ msgstr "Dienos pradЧia:"
+
+#~ msgid "TaskPad"
+#~ msgstr "UЧduotys"
+
+#~ msgid "Time Until Due"
+#~ msgstr "LikФs laikas"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Laiko dalijimas:"
+
+#~ msgid "Time format:"
+#~ msgstr "Laiko formatas:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "PerspКjimai vaizdu"
+
+#~ msgid "Work week"
+#~ msgstr "Darbo savaitК"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minutes prieП jiems Аvykstant."
+
+#~ msgid "seconds."
+#~ msgstr "sekundЧiЬ."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% А_vykdyta:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "K_lasifikacija:"
+
+#~ msgid "Date Completed:"
+#~ msgstr "UЧbaigimo data:"
+
+#~ msgid "High"
+#~ msgstr "AukПtas"
+
+#~ msgid "In Progress"
+#~ msgstr "Vykdoma"
+
+#~ msgid "Low"
+#~ msgstr "чemas"
+
+#~ msgid "Normal"
+#~ msgstr "Normalus"
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Sukurti naujЮ laiПkЮ"
+#~ msgid "Not Started"
+#~ msgstr "NepradКta"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
+#~ msgid "Task"
+#~ msgstr "UЧduotis"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Aplankas"
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontaktai..."
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltruoti pagal SiuntКjЮ"
+#~ msgid "_Due Date:"
+#~ msgstr "_Kada reikia:"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtruoti pagal _GavКjus"
+#~ msgid "_Priority:"
+#~ msgstr "_Svarbumas:"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Pa_mirПti slaptaЧodЧius"
+#~ msgid "_Status:"
+#~ msgstr "_BШsena:"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Gauti paПtЮ"
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Vis_os dienos Аvykis"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "аvykio pagrindai"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Kitoks pakartojimas"
+
+#~ msgid "Days"
+#~ msgstr "Dienos"
+
+#~ msgid "Every"
+#~ msgstr "Kas"
+
+#~ msgid "Exceptions"
+#~ msgstr "IПimtys"
+
+#~ msgid "Hours"
+#~ msgstr "Valandos"
+
+#~ msgid "Mail _to:"
+#~ msgstr "SiЬsti _kam:"
+
+#~ msgid "Minutes"
+#~ msgstr "MinutКs"
+
+#~ msgid "Modify"
+#~ msgstr "Keisti"
+
+#~ msgid "No recurrence"
+#~ msgstr "Jokio pakartojimo"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "PerЧiШra:"
+
+#~ msgid "Pri_vate"
+#~ msgstr "As_meniПkas"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_VieПas"
+
+#~ msgid "Recurrence"
+#~ msgstr "Pasikartojimas"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pakartojimo taisyklК"
+
+#~ msgid "Reminder"
+#~ msgstr "Priminimas"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Paprastas pakartojimas"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Sa_ntrauka:"
+
+#~ msgid "Time"
+#~ msgstr "Laikas"
+
+#~ msgid "_Audio"
+#~ msgstr "_Garsu"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Slaptas"
+
+#~ msgid "_Mail"
+#~ msgstr "PaП_tu"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "_Run program:"
+#~ msgstr "Pa_leisti programЮ:"
+
+#~ msgid "_Start time:"
+#~ msgstr "_PradЧios laikas:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_PradЧios data:"
+
+#~ msgid "day(s)"
+#~ msgstr "dienЮ(as)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "dКl"
+
+#~ msgid "forever"
+#~ msgstr "amЧinai"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "mКnesА(ius)"
+
+#~ msgid "until"
+#~ msgstr "iki"
+
+#~ msgid "week(s)"
+#~ msgstr "savaitФ(es)"
+
+#~ msgid "year(s)"
+#~ msgstr "metus"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Nepavyko sukurti kalendoriaus Хia: ╔%s╢"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "IПtrinti laiПkЮ"
+#~ msgid "April"
+#~ msgstr "balandis"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "PersiЬstas laiПkas -- %s"
+#~ msgid "August"
+#~ msgstr "rugpjШtis"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Spausdinti parinktЮ laiПkЮ"
+#~ msgid "December"
+#~ msgstr "gruodis"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "PaПto _filtrai..."
+#~ msgid "February"
+#~ msgstr "vasaris"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Tvarkyti uЧsakymus..."
+#~ msgid "Go To Date"
+#~ msgstr "пokti А datЮ"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "PaЧymКti s_kaitytu"
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "пokti А ПiandienЮ"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "PaЧymКti _neskaityta"
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "sausis"
+
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "liepa"
+
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "birЧelis"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Perkelti"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "kovas"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "PirmadienА"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "lapkritis"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "LaiПko spaudinio perЧiШra..."
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "spalis"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Spausdinti laiПkЮ spausdintuvu"
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "rugsКjis"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Spausdinti laiПkЮ..."
+#~ msgid "Attachment properties"
+#~ msgstr "Priedo savybКs"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Atsakyti _visiems"
+#~ msgid "File name:"
+#~ msgstr "Bylos vardas:"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Atsakyti _siuntКjui"
+#~ msgid "MIME type:"
+#~ msgstr "MIME tipas:"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "PaЧymКti _viskЮ"
+#~ msgid "Edit VFolders"
+#~ msgstr "Taisyti vAplankus"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "IПsiЬsti laukianti АaПtЮ ir parsiЬsti naujЮ paПtЮ"
+#~ msgid "Filter Rules"
+#~ msgstr "Filtro taisyklКs"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Rodyti"
+#~ msgid "Incoming"
+#~ msgstr ""
+#~ "Gaunamas\n"
+#~ "SiunХiamas\n"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
+#, fuzzy
+#~ msgid "Outgoing"
+#~ msgstr "KontШrai:"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "vAplankas pagal Siu_ntКjЮ"
+#~ msgid "Virtual Folders"
+#~ msgstr "VirtualШs aplankai"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "vAplankas pagal _GavКjus"
+#~ msgid "vFolder Sources"
+#~ msgstr "vAplankЬ Пaltiniai"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#~ msgid "Save"
+#~ msgstr "IПsaugoti"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Pritaikyti filtrus"
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Rodyti"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Tvarkyti aplankЮ"
+#, fuzzy
+#~ msgid "Hide selected"
+#~ msgstr "IПtrintas"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Kopijuoti А aplankЮ"
+#~ msgid "Hide read"
+#~ msgstr "SlКpti"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Taisyti laiПkЮ"
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "IПtrintas"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "IП_tuПtinti"
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Tema"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "_Filtruoti pagal TemЮ"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Filtruoti pagal SiuntКjЮ"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_PersiЬsti"
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Taisyti laiПkЮ"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Invertuoti paЧymКjimЮ"
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Tema"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "_PaПto nustatymas...."
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "NegalКjau paleisti wombat"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_LaiПkas"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "PaПto dКЧutКs santrauka"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Perkelti А aplankЮ"
+#~ msgid "New store format:"
+#~ msgstr "NaujienЬ Пaltinio tipas:"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Atidaryti naujame lange"
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Spausdinti laiПkЮ"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Tu neturi sutvarkytЬ paПto ПaltiniЬ"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "IПsaugoti kaip..."
+#~ msgid "Account Information"
+#~ msgstr "NКra informacijos"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "пaltinis"
+#~ msgid "Account Properties"
+#~ msgstr "Priedo savybКs"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_Gijomis"
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "Autentikacija:"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "_IПtrinti"
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentikacija:"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_vAplankas pagal TemЮ"
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "NeiПtrinti laiПkЬ iП serverio"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "_VirtualiЬ aplankЬ taisiklis..."
+#~ msgid "Done"
+#~ msgstr "Jokios"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Attach"
-msgstr "Prisegti bylЮ"
+#~ msgid "E-Mail Address:"
+#~ msgstr "El. paПto adresas:"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "IПsaugoti esamЮ bylЮ"
+#~ msgid "Email Address:"
+#~ msgstr "El. paПto adresas:"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "UЧПifruotas laiПkas"
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "PaПto Nustatymas"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "Pilnas vardas:"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Prisegti bylЮ prie Пio laiПko"
+#~ msgid "Hostname:"
+#~ msgstr "Vartotojo vardas:"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#~ msgid "Identity"
+#~ msgstr "AsmenybК"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Atidaryti bylЮ"
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "PaП_tu"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "turi"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "PaПto Nustatymas"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "IПsaugoti k_aip"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "PaПto Nustatymas"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "Naujas"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Eiti А aplankЮ..."
+#~ msgid "Optional"
+#~ msgstr "Parinktys"
+
+#~ msgid "Organization:"
+#~ msgstr "Organizacija:"
 
-#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-msgid "Save the current file with a different name"
-msgstr "IПsaugoti esamЮ bylЮ"
+#~ msgid "Password:"
+#~ msgstr "SlaptaЧodis"
 
-#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Save the message in a specified folder"
-msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+#~ msgid "Reply-to:"
+#~ msgstr "Atsakyti-kam:"
 
-#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-msgid "Send"
-msgstr "SiuntКjas"
+#~ msgid "Required"
+#~ msgstr "_Reikalingi ЧmonКs"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "SiuntКjas"
+#~ msgid "Save password"
+#~ msgstr "IПsaugoti kaip VCard"
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "SiuntКjas"
+#~ msgid "Select signature file"
+#~ msgstr "ParaПo byla:"
 
-#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-msgid "Send the mail in HTML format"
-msgstr "SiЬsti laiПkus HTML formatu"
+#~ msgid "Sending Email"
+#~ msgstr "Sendmail"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Suskirstyti laiПkus А gijas"
+#~ msgid "Server Configuration"
+#~ msgstr "PaПto Nustatymas"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "SiЬsti laiПkus HTML formatu"
+#~ msgid "Server Type: "
+#~ msgstr "Serveris:"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "IПtrinti ПА laiПkЮ"
+#~ msgid "Servers"
+#~ msgstr "Serveris:"
+
+#~ msgid "Signature file:"
+#~ msgstr "ParaПo byla:"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "IПsaugoti priedЮ"
+#~ msgid "Signature:"
+#~ msgstr "ParaПo byla:"
+
+#~ msgid "Sources"
+#~ msgstr "пaltiniai"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "priedas"
+#~ msgid "Type"
+#~ msgstr "Tipas:"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "priedas"
+#~ msgid "User Information"
+#~ msgstr "NКra informacijos"
+
+#~ msgid "Username:"
+#~ msgstr "Vartotojo vardas:"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "SiunХiu laiПkЮ be temos"
+#~ msgid "minute(s)"
+#~ msgstr "minuХiЬ"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#~ 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 ""
+#~ "аvesk savo vardЮ ir el. paПto adresЮ, naudojamus siunХiamam paПtui. Tu taip "
+#~ "pat gali Аvesti savo organizacijos pavadinimЮ, ir bylos vardЮ, iП kurios bus "
+#~ "skaitomas tavo paraПas."
+
+#~ msgid "Full name:"
+#~ msgstr "Pilnas vardas:"
+
+#~ msgid "Email address:"
+#~ msgstr "El. paПto adresas:"
+
+#~ msgid "Signature File"
+#~ msgstr "ParaПo byla"
+
+#~ msgid "Server:"
+#~ msgstr "Serveris:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "AtpaЧinti palaikomus tipus..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "NeiПtrinti laiПkЬ iП serverio"
+
+#~ msgid "Test Settings"
+#~ msgstr "Testuoti nuostatas"
+
+#~ msgid "Mail source type:"
+#~ msgstr "PaПto Пaltinio tipas:"
+
+#~ 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 ""
+#~ "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Ю."
+
+#~ msgid "News source type:"
+#~ msgstr "NaujienЬ Пaltinio tipas:"
+
+#~ 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 ""
+#~ "Pasirink tavo turimo naujienЬ serverio rШПА, ir Аvesk reikalingЮ informacijЮ "
+#~ "apie jА.\n"
+#~ "\n"
+#~ "Jei serveris reikalauja autentikacijos, gali АvedФs kitЮ informacijЮ "
+#~ "paspausti ╔AtpaЧinti palaikomus tipus╢ mygtukЮ."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "PaПto siuntimo tipas:"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "Atidaryti..."
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Pasirink rШПА paПto serverio, kurА naudoji, ir Аvesk svarbiЮ informacijЮ "
+#~ "apie jА.\n"
+#~ "\n"
+#~ "Jei serveris reikalauja tapatybКs patvirtinimo, gali paspausti ╔AtpaЧinti "
+#~ "palaikomus tipus...╢ mygtukЮ, kai Аvesi informacijЮ."
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#~ msgid "Add Identity"
+#~ msgstr "PridКti asmenybФ"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "PridКti aplankЮ А uЧsakytЬ aplankЬ sЮraПЮ"
+#~ msgid "Edit Identity"
+#~ msgstr "Taisyti asmenybФ"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Atnaujinti sЮraПЮ"
+#~ msgid "Add Source"
+#~ msgstr "PridКti ПaltinА"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Atnaujinti aplankЬ sЮraПЮ"
+#~ msgid "Edit Source"
+#~ msgstr "Keisti ПaltinА"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "PaПalinti aplankЮ iП uЧsakytЬ aplankЬ sЮraПo"
+#~ msgid "Add News Server"
+#~ msgstr "PridКti naujienЬ serverА"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "UЧsakyti"
+#~ msgid "Edit News Server"
+#~ msgstr "Keisti naujienЬ serverА"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Atsisakyti"
+#~ msgid "Testing \"%s\""
+#~ msgstr "Testuoju ╔%s╢"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Parodyti kitЮ aplankЮ"
+#~ msgid "The connection was successful!"
+#~ msgstr "Prisijungimas buvo sКkmingas!"
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "I_Пeiti"
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "UЧklausiamos ╔%s╢ autorizacijos galimybКs."
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution juostos _trumpК"
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "UЧklausti autorizacijos pas ╔%s╢"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "IПeiti iП programos"
+#~ msgid "Address"
+#~ msgstr "Adresas"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "_SusipaЧinimas"
+#~ msgid "Identities"
+#~ msgstr "AsmenybКs"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Parodyti informacijЮ apie Evolution"
+#~ msgid "Mail Sources"
+#~ msgstr "PaПto Пaltiniai"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Rodyti _AplankЬ juostЮ"
+#~ msgid "Mail Transport"
+#~ msgstr "PaПto siuntimas"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Rodyti _TrumpiЬ juostЮ"
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "PaЧymКti laiПkЮ skaitytu [ms]:"
+
+#~ msgid "News Servers"
+#~ msgstr "NaujienЬ serveriai"
+
+#~ msgid "News Sources"
+#~ msgstr "NaujienЬ Пaltiniai"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "SiЬsti laiПkus HTML formatu"
+
+#~ msgid "Delete a contact"
+#~ msgstr "IПtrinti kontaktЮ"
+
+#~ msgid "Find"
+#~ msgstr "Rasti"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rasti kontaktЮ"
+
+#~ msgid "Print contacts"
+#~ msgstr "Spausdinti kontaktus"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Sustabdyti АkКlimЮ"
+
+#~ msgid "View All"
+#~ msgstr "Rodyti visus"
+
+#~ msgid "View all contacts"
+#~ msgstr "Rodyti visus kontaktus"
 
-#: ui/evolution.xml.h:14
 #, fuzzy
-msgid "Submit _Bug Report"
-msgstr "IП_siЬsti klaidos praneПimЮ"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_PaПto nustatymas...."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "S_pausdinti kontaktus..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_IeПkoti kontaktЬ"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dienos"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Sutvarkyti kalendoriЬ"
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "PraneПti apie klaidЮ, naudojant Bug Buddy"
+#~ msgid "Ca_lendar"
+#~ msgstr "Kalendorius"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Perjungti, ar rodyti aplankЬ juostЮ"
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Kalendoriaus nuostatos..."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Perjungti, ar rodyti trumpiЬ juostЮ"
+#~ msgid "Create a new appointment"
+#~ msgstr "Sukurti naujЮ АvykА"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "K_ontaktЬ menedЧerio naudojimas"
+#~ msgid "Create a new calendar"
+#~ msgstr "Sukurti naujЮ kalendoriЬ"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "_Kalendoriaus vartojimas"
+#~ msgid "Day"
+#~ msgstr "Diena"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "PaПto programos naudojimas"
+#~ msgid "Go back in time"
+#~ msgstr "Eiti А ankstesnА laikЮ"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Apie Evolution..."
+#~ msgid "Go forward in time"
+#~ msgstr "Eiti А ateities laikЮ"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "а_vykis"
+#~ msgid "Go to"
+#~ msgstr "пokti"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Kontaktas"
+#~ msgid "Go to a specific date"
+#~ msgstr "пokti А nurodytЮ datЮ"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Aplankas"
+#~ msgid "Go to present time"
+#~ msgstr "Eiti А dabartinА laikЮ"
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Eiti А aplankЮ..."
+#~ msgid "Month"
+#~ msgstr "MКnesis"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Turinys"
+#~ msgid "Open a calendar"
+#~ msgstr "Atidaryti kalendoriЬ"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "_PaПto laiПkas"
+#~ msgid "Prev"
+#~ msgstr "Atgal"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_Nuostatos"
+#~ msgid "Print this calendar"
+#~ msgstr "Spausdinti ПА kalendoriЬ"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_UЧduotis"
+#, fuzzy
+#~ msgid "Save calendar as something else"
+#~ msgstr "_IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#~ msgid "Show 1 day"
+#~ msgstr "Rodyti 1 dienЮ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Bandymas"
+#~ msgid "Show 1 month"
+#~ msgstr "Rodyti 1 mКnesА"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "UЧimtas"
+#~ msgid "Show 1 week"
+#~ msgstr "Rodyti 1 savaitФ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Nesu darbe"
+#~ msgid "Show the working week"
+#~ msgstr "Rodyti darbo savaitФ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "NКra informacijos"
+#~ msgid "Week"
+#~ msgstr "SavaitК"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Pakv_iesti kitus..."
+#~ msgid "_New"
+#~ msgstr "_Naujas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Parinktys"
+#~ msgid "_Open Calendar"
+#~ msgstr "_Atidaryti kalendoriЬ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Rodyti tik _darbo valandas"
+#~ msgid "_Print this calendar"
+#~ msgstr "S_pausdinti ПА kalendoriЬ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Rodyti _atitrauktЮ"
+#, fuzzy
+#~ msgid "_Save As..."
+#~ msgstr "IПsaugoti _kaip..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Atnaujinti Laisvas/UЧimtas"
+#~ msgid "Delete this item"
+#~ msgstr "IПtrinti ПА daiktЮ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "Delete..."
+#~ msgstr "IПtrinti"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "_Pagalba"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "Print En_velope..."
+#~ msgstr "Spausdinimo _nuostatos...."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Visi ЧmonКs ir resursai"
+#~ msgid "Print this item"
+#~ msgstr "Spausdinti ПА daiktЮ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Visi Ч_monКs ir vienas resursas"
+#~ msgid "Print..."
+#~ msgstr "Spausdinti..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Reikalingi ЧmonКs"
+#~ msgid "Save _As..."
+#~ msgstr "IПsaugoti _kaip..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Reikalingi ЧmonКs ir _vienas resursas"
+#~ msgid "Save and Close"
+#~ msgstr "IПsaugoti ir uЧdaryti"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Susitikimo _pradЧios laikas:"
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "IПsaugoti kontaktЮ ir uЧdaryti dialogo langЮ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Susitikimo pa_baigos laikas:"
+#~ msgid "See online help"
+#~ msgstr "Rodyti ЧinynЮ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Visi dalyviai"
+#~ msgid "_File"
+#~ msgstr "_Byla"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PATKPпS"
+#, fuzzy
+#~ msgid "_Print..."
+#~ msgstr "Spausdinti..."
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "_Save"
+#~ msgstr "IП_saugoti"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "About this application"
+#~ msgstr "Apie ПiЮ aplikacijЮ"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Dabar"
+#~ msgid "About..."
+#~ msgstr "Apie..."
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "C_lear"
+#~ msgstr "IПva_lyti"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "C_ut"
+#~ msgstr "_IПkirpti"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "GrupК %i"
+#~ msgid "Clear"
+#~ msgstr "IПvalyti"
+
+#~ msgid "Clear the selection"
+#~ msgstr "IПvalyti paЧymКjimЮ"
+
+#~ msgid "Close this appointment"
+#~ msgstr "UЧdaryti ПА АvykА"
+
+#~ msgid "Copy"
+#~ msgstr "Kopijuoti"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopijuoti paЧymКjimЮ"
+
+#~ msgid "Cut"
+#~ msgstr "IПkirpti"
+
+#~ msgid "Cut the selection"
+#~ msgstr "IПkirpti paЧymКjimЮ"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "_AdresЬ knygelК..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "_Tikrinti vardus"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "Pagalba"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "Ne_baigta uЧduotis"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "аterpti bylЮ"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Pasi_kartojimas"
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "o kas Хia dabar?"
+
+#~ msgid "Find Again"
+#~ msgstr "Rasti vКl"
+
+#~ msgid "Find _Again"
+#~ msgstr "Rasti _vКl"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Pakeisti bylos savybes"
+
+#~ msgid "N_ext"
+#~ msgstr "_Tolesnis"
+
+#~ msgid "Paste"
+#~ msgstr "аdКti"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "аdКti iП krepПio"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Spausdinimo _nuostatos...."
+
+#~ msgid "Print Setup"
+#~ msgstr "Puslapio nuostatos"
+
+#~ msgid "Properties"
+#~ msgstr "SavybКs"
+
+#~ msgid "Redo"
+#~ msgstr "Pakartoti"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Pakartoti atПauktЮ veiksmЮ"
+
+#~ msgid "Replace"
+#~ msgstr "Pakeisti"
+
+#~ msgid "Replace a string"
+#~ msgstr "Pakeisti eilutФ"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
+
+#~ msgid "Save the current file"
+#~ msgstr "IПsaugoti esamЮ bylЮ"
+
+#, fuzzy
+#~ msgid "Schedule Meeting"
+#~ msgstr "аraПyti susitikimЮ А dienotvarkФ"
+
+#, fuzzy
+#~ msgid "Schedule _Meeting"
+#~ msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "VКl ieПkoti tos paХios eilutКs"
+
+#~ msgid "Search for a string"
+#~ msgstr "IeПkoti eilutКs"
+
+#~ msgid "Select All"
+#~ msgstr "PaЧymКti visЮ"
+
+#~ msgid "Select everything"
+#~ msgstr "PaЧymКti viskЮ"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+
+#~ msgid "Undo"
+#~ msgstr "AtПaukti"
+
+#~ msgid "Undo the last action"
+#~ msgstr "AtПaukti paskutinА veiksmЮ"
+
+#~ msgid "_About..."
+#~ msgstr "_Apie..."
+
+#~ msgid "_Close"
+#~ msgstr "U_Чdaryti"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopijuoti"
+
+#~ msgid "_Debug"
+#~ msgstr "_Derinti"
+
+#~ msgid "_Edit"
+#~ msgstr "_Taisa"
+
+#~ msgid "_Find..."
+#~ msgstr "_Rasti..."
+
+#~ msgid "_Help"
+#~ msgstr "_Pagalba"
+
+#~ msgid "_Paste"
+#~ msgstr "а_dКti"
+
+#~ msgid "_Print"
+#~ msgstr "S_pausdinti"
+
+#~ msgid "_Properties..."
+#~ msgstr "_SavybКs..."
+
+#~ msgid "_Redo"
+#~ msgstr "Paka_rtoti"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Pakeisti..."
+
+#~ msgid "_Undo"
+#~ msgstr "_AtПaukti"
+
+#~ msgid "Compose"
+#~ msgstr "Sukurti"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Sukurti naujЮ laiПkЮ"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
+
+#~ msgid "F_older"
+#~ msgstr "_Aplankas"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltruoti pagal SiuntКjЮ"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtruoti pagal _GavКjus"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Pa_mirПti slaptaЧodЧius"
 
-#~ msgid "categories"
-#~ msgstr "kategorijos"
+#~ msgid "Get Mail"
+#~ msgstr "Gauti paПtЮ"
+
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "IПtrinti laiПkЮ"
+
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "PersiЬstas laiПkas -- %s"
+
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Spausdinti parinktЮ laiПkЮ"
+
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "PaПto _filtrai..."
+
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Tvarkyti uЧsakymus..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "PaЧymКti s_kaitytu"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "PaЧymКti _neskaityta"
+
+#~ msgid "Move"
+#~ msgstr "Perkelti"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "LaiПko spaudinio perЧiШra..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Spausdinti laiПkЮ spausdintuvu"
+
+#~ msgid "Print message..."
+#~ msgstr "Spausdinti laiПkЮ..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Atsakyti _visiems"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Atsakyti _siuntКjui"
+
+#~ msgid "Select _All"
+#~ msgstr "PaЧymКti _viskЮ"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "IПsiЬsti laukianti АaПtЮ ir parsiЬsti naujЮ paПtЮ"
+
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Rodyti"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "vAplankas pagal Siu_ntКjЮ"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "vAplankas pagal _GavКjus"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Pritaikyti filtrus"
+
+#, fuzzy
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopijuoti А aplankЮ"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Taisyti laiПkЮ"
+
+#~ msgid "_Expunge"
+#~ msgstr "IП_tuПtinti"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtruoti pagal TemЮ"
+
+#~ msgid "_Forward"
+#~ msgstr "_PersiЬsti"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Invertuoti paЧymКjimЮ"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_PaПto nustatymas...."
+
+#~ msgid "_Message"
+#~ msgstr "_LaiПkas"
+
+#, fuzzy
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Perkelti А aplankЮ"
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Atidaryti naujame lange"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Spausdinti laiПkЮ"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "IПsaugoti kaip..."
+
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "пaltinis"
+
+#~ msgid "_Threaded"
+#~ msgstr "_Gijomis"
+
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "_IПtrinti"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_vAplankas pagal TemЮ"
+
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "_VirtualiЬ aplankЬ taisiklis..."
+
+#, fuzzy
+#~ msgid "Attach"
+#~ msgstr "Prisegti bylЮ"
+
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "IПsaugoti esamЮ bylЮ"
+
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "UЧПifruotas laiПkas"
+
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Prisegti bylЮ prie Пio laiПko"
+
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Atidaryti bylЮ"
+
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "IПsaugoti k_aip"
+
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Eiti А aplankЮ..."
+
+#, fuzzy
+#~ msgid "Save the current file with a different name"
+#~ msgstr "IПsaugoti esamЮ bylЮ"
+
+#, fuzzy
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "SiuntКjas"
+
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "SiuntКjas"
+
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "SiuntКjas"
+
+#, fuzzy
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "SiЬsti laiПkus HTML formatu"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Suskirstyti laiПkus А gijas"
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "SiЬsti laiПkus HTML formatu"
+
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "IПtrinti ПА laiПkЮ"
+
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "IПsaugoti priedЮ"
+
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "priedas"
+
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "SiunХiu laiПkЮ be temos"
+
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "Atidaryti..."
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "PridКti aplankЮ А uЧsakytЬ aplankЬ sЮraПЮ"
+
+#~ msgid "Refresh List"
+#~ msgstr "Atnaujinti sЮraПЮ"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Atnaujinti aplankЬ sЮraПЮ"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "PaПalinti aplankЮ iП uЧsakytЬ aplankЬ sЮraПo"
+
+#~ msgid "Subscribe"
+#~ msgstr "UЧsakyti"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Atsisakyti"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Parodyti kitЮ aplankЮ"
+
+#~ msgid "E_xit"
+#~ msgstr "I_Пeiti"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution juostos _trumpК"
+
+#~ msgid "Exit the program"
+#~ msgstr "IПeiti iП programos"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_SusipaЧinimas"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Parodyti informacijЮ apie Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Rodyti _AplankЬ juostЮ"
+
+#, fuzzy
+#~ msgid "Submit _Bug Report"
+#~ msgstr "IП_siЬsti klaidos praneПimЮ"
+
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "PraneПti apie klaidЮ, naudojant Bug Buddy"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Perjungti, ar rodyti aplankЬ juostЮ"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Perjungti, ar rodyti trumpiЬ juostЮ"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "K_ontaktЬ menedЧerio naudojimas"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Kalendoriaus vartojimas"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "PaПto programos naudojimas"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Apie Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "а_vykis"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontaktas"
+
+#~ msgid "_Folder"
+#~ msgstr "_Aplankas"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Eiti А aplankЮ..."
+
+#~ msgid "_Index"
+#~ msgstr "_Turinys"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_PaПto laiПkas"
+
+#~ msgid "_Settings"
+#~ msgstr "_Nuostatos"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_UЧduotis"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Daiktas (ai) priklauso Пioms kategorijoms:"
@@ -7614,9 +7252,6 @@ msgstr "GrupК %i"
 #~ msgid "Preferences"
 #~ msgstr "Parinktys"
 
-#~ msgid "Alarms"
-#~ msgstr "PerspКjimai"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "PerspКjimo savybКs"
 
@@ -7638,13 +7273,6 @@ msgstr "GrupК %i"
 #~ 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"
 
@@ -7666,9 +7294,6 @@ msgstr "GrupК %i"
 #~ msgid "Draft"
 #~ msgstr "JuodraПtis"
 
-#~ msgid "Flagged"
-#~ msgstr "Svarbus"
-
 #~ msgid "Set Flag"
 #~ msgstr "UЧdКti svarbumЮ"
 
diff --git a/po/nl.po b/po/nl.po
index 63c84def5f..8cde00a134 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,11 +4,11 @@
 # Gerard Oskamp <gerard@linuxfreak.nl>, 2000
 # Dennis Smit <synap@area101.penguin.nl>, 2000
 # Almer S. Tigelaar <almer1@dds.nl>, 2000
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -16,14 +16,203 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+# mail/component-factory.c:196

+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan het post gedeelte van Evolution niet initialiseren."
+
+# addressbook/backend/ebook/load-pine-addressbook.c:41
+# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Kon Bonobo niet initialiseren"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr "Reflow Test"
+
+# shell/e-shell-view-menu.c:161

+#: addressbook/gui/widgets/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr "Dit zou het 'reflow' canvas item moeten testen"
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox-formaat post bestanden"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Een dergelijk bericht bestaat niet"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+# mail/mail-ops.c:374

+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Bezig met ophalen post van %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+# calendar/gui/dialogs/alarm-notify.glade.h:7

+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Sluiten"
+
+# shell/e-shell-view-menu.c:402

+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Verplaats naar Map"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:857

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

+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ga naar het vorige item"
+
+# addressbook/contact-editor/e-contact-editor.c:860

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

+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ga naar het volgende item"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configureer Map"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kon bestand %s niet openen:\n"
+"%s"
+
+# composer/e-msg-composer.c:494

+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Fout bij het lezen van post bestand: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+# shell/e-storage.c:412

+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Geen fout"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Test verbinding naar \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Kon niet verbinden met POP server op %s."
+
+# shell/e-shell-view-menu.c:398

+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nieuw"
+
+# shell/e-shell-view-menu.c:404

+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Nieuwe map aanmaken"
+
+# mail/component-factory.c:196

+#: notes/component-factory.c:152
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
+
+# mail/main.c:62

+#: notes/main.c:30
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
+
 # addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kaart: "
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -31,7 +220,7 @@ msgstr ""
 "\n"
 "Naam: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -39,7 +228,7 @@ msgstr ""
 "\n"
 "  Prefix:      "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -47,7 +236,7 @@ msgstr ""
 "\n"
 "  Gegeven:      "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -55,7 +244,7 @@ msgstr ""
 "\n"
 "  Extra: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +253,7 @@ msgstr ""
 "  Familie:      "
 
 # addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +261,7 @@ msgstr ""
 "\n"
 "  Achtervoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +270,7 @@ msgstr ""
 "Geboorte Datum: "
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +278,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +286,7 @@ msgstr ""
 "\n"
 "  Postbus:  "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +294,7 @@ msgstr ""
 "\n"
 "Ext:           "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +302,7 @@ msgstr ""
 "\n"
 "  Straat:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +310,7 @@ msgstr ""
 "\n"
 "  Stad:        "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +318,7 @@ msgstr ""
 "\n"
 "  Regio:      "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +326,7 @@ msgstr ""
 "\n"
 "  Postcode: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +334,7 @@ msgstr ""
 "\n"
 "  Land:      "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +342,7 @@ msgstr ""
 "\n"
 "Afleverings Label: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +350,7 @@ msgstr ""
 "\n"
 "Telefoons:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +359,7 @@ msgstr ""
 "Telefoon:"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -179,7 +368,7 @@ msgstr ""
 "E-mail:\n"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -187,7 +376,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -195,7 +384,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -204,7 +393,7 @@ msgstr ""
 "Tijdzone: "
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -213,7 +402,7 @@ msgstr ""
 "Geografische Locatie: "
 
 # addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -221,7 +410,7 @@ msgstr ""
 "\n"
 "Bedrijfsrol: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -231,7 +420,7 @@ msgstr ""
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -239,7 +428,7 @@ msgstr ""
 "\n"
 "Naam:   "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -247,7 +436,7 @@ msgstr ""
 "\n"
 "  Eenheid:  "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -255,7 +444,7 @@ msgstr ""
 "\n"
 "  Eenheid2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -263,7 +452,7 @@ msgstr ""
 "\n"
 "  Eenheid3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -272,7 +461,7 @@ msgstr ""
 "  Eenheid4: "
 
 # addressbook/contact-editor/categories-strings.h:7

-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -281,7 +470,7 @@ msgstr ""
 "CategorieКn: "
 
 # calendar/gui/gncal-todo.c:207

-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -299,7 +488,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -307,7 +496,7 @@ msgstr ""
 "\n"
 "Unieke Tekenreeks: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -315,19 +504,6 @@ msgstr ""
 "\n"
 "Publieke Sleutel: "
 
-# addressbook/backend/ebook/load-pine-addressbook.c:41
-# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kon Bonobo niet initialiseren"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -445,40 +621,31 @@ 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:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
-# addressbook/gui/component/addressbook.c:426

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Contact verwijderen?"
-
 # addressbook/contact-editor/e-contact-editor-strings.h:7

 #.
 #. * Translatable strings file generated by Glade.
@@ -492,7 +659,7 @@ msgstr "_Toevoegen"
 # addressbook/contact-editor/e-contact-editor-strings.h:8

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

 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -509,14 +676,7 @@ msgid "New phone type"
 msgstr "Nieuw telefoon type"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:11

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -589,7 +749,6 @@ msgstr "K_ontakten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:27

 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieКn..."
 
@@ -610,8 +769,6 @@ msgstr "_Adres..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:30

 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Algemeen"
 
@@ -667,12 +824,12 @@ msgstr "Aa_ntekeningen:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:41

 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Details"
 
 # addressbook/contact-editor/e-contact-editor.c:1278

 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -680,16 +837,19 @@ msgstr "Assistent"
 # addressbook/contact-editor/e-contact-editor.c:1383

 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor.c:1280

 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1281

 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Bedrijfs Fax"
 
@@ -700,6 +860,7 @@ msgstr "Terugbel"
 
 # addressbook/contact-editor/e-contact-editor.c:1283

 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Auto"
 
@@ -712,26 +873,31 @@ msgstr "Bedrijf"
 # addressbook/contact-editor/e-contact-editor.c:1384

 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1286

 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Thuis 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1287

 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1288

 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
 # addressbook/contact-editor/e-contact-editor.c:1289

 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
@@ -739,7 +905,7 @@ msgstr "Mobiele Telefoon"
 # addressbook/contact-editor/e-contact-editor.c:1385

 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Overige"
 
@@ -750,11 +916,13 @@ msgstr "Andere Fax"
 
 # addressbook/contact-editor/e-contact-editor.c:1292

 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Oppieper"
 
 # addressbook/contact-editor/e-contact-editor.c:1293

 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Eerste"
 
@@ -775,67 +943,16 @@ msgstr "TTY/TDD"
 
 # addressbook/contact-editor/e-contact-editor.c:1341

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

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

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Adres _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Canada"
-
-# composer/e-msg-composer-address-dialog.glade.h:11

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

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

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

-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Gemeente:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Postbus:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Staat/Provincie:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Postcode:"
-
 # addressbook/contact-editor/fullname-strings.h:7

 #.
 #. * Translatable strings file generated by Glade.
@@ -913,12 +1030,7 @@ msgstr "Als _Minikaarten"
 
 # addressbook/gui/component/addressbook.c:499

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

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als _Tabel"
 
@@ -953,34 +1065,34 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 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:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 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:561
+#: addressbook/gui/component/addressbook.c:563
 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:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-mail bevat"
 
 # addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
@@ -1013,9 +1125,9 @@ msgstr ""
 
 # mail/folder-browser-factory.c:101

 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1055,13 +1167,11 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Onthoud dit wachtwoord"
 
 # calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Uren"
@@ -1084,13 +1194,11 @@ msgstr "Zoeken"
 
 # mail/mail-config.c:739 mail/mail-config.c:819

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

 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pad:"
 
@@ -1121,236 +1229,107 @@ msgstr ""
 # addressbook/gui/component/ldap-server-dialog.glade.h:11

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

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

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

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

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

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

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

-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Verwijderen"
-
-# calendar/gui/gncal-todo.c:488

-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Bewerken"
-
-# composer/e-msg-composer-address-dialog.glade.h:10

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

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Vind..."
-
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Geaddresseerden"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Selecteer namen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Selecteer naam uit lijst:"
-
 # composer/e-msg-composer-address-dialog.glade.h:9

 #: 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-# addressbook/gui/component/alphabet.glade.h:9

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

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

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

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

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

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

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

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

-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-# addressbook/gui/component/alphabet.glade.h:17

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

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

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

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

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

-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
+# addressbook/gui/component/addressbook.c:943

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

+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Opslaan als VCard"
 
-# addressbook/gui/component/alphabet.glade.h:23

-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+# composer/e-msg-composer-address-dialog.glade.h:10

+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Naam"
 
-# addressbook/gui/component/alphabet.glade.h:24

-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+# addressbook/contact-editor/e-contact-editor.c:1341

+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-mail 2"
 
-# addressbook/gui/component/alphabet.glade.h:25

-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+# mail/mail-config.c:328

+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisatie"
 
-# addressbook/gui/component/alphabet.glade.h:26

-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-# addressbook/gui/component/alphabet.glade.h:27

-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+# addressbook/contact-editor/e-contact-editor-strings.h:31

+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "Af_deling:"
 
-# addressbook/gui/component/alphabet.glade.h:28

-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+# addressbook/contact-editor/e-contact-editor-strings.h:32

+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "Kant_oor:"
 
-# addressbook/gui/component/alphabet.glade.h:29

-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+# addressbook/contact-editor/fullname-strings.h:8

+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Titel:"
 
-# addressbook/gui/component/alphabet.glade.h:30

-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+# addressbook/contact-editor/e-contact-editor-strings.h:33

+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Beroep:"
 
-# addressbook/gui/component/alphabet.glade.h:31

-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+# addressbook/contact-editor/e-contact-editor.c:1292

+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Oppieper"
 
-# addressbook/gui/component/alphabet.glade.h:32

-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+# addressbook/contact-editor/e-contact-editor-strings.h:34

+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Nickname:"
 
-# addressbook/gui/component/alphabet.glade.h:33

-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+# addressbook/contact-editor/e-contact-editor-strings.h:35

+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_Echtgeno(o)t(e):"
 
-# addressbook/gui/component/alphabet.glade.h:34

-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+# shell/e-shell-view.c:596

+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Geen"
 
-# addressbook/gui/component/addressbook.c:943

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

-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Opslaan als VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
 # addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Opslaan in adresboek"
 
 # addressbook/gui/minicard/e-minicard-view.c:110

-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1364,229 +1343,6 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-# addressbook/printing/e-contact-print.glade.h:23

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 punts Tahoma"
-
-# addressbook/printing/e-contact-print.glade.h:25

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

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

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

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

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

-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Dimensies:"
-
-# 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:12
-msgid "Font..."
-msgstr "Lettertype..."
-
-# addressbook/printing/e-contact-print.glade.h:19

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Type:"
-
-# addressbook/printing/e-contact-print.glade.h:33

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

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

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

-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution Kalender Kanaal"
@@ -1595,13 +1351,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
@@ -1614,69 +1370,11 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-# calendar/gui/calendar-commands.c:659

-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Kalender"
-
-# mail/component-factory.c:196

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution Kalender Kanaal"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 # calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
@@ -1685,7 +1383,7 @@ msgid "Reminder of your appointment at "
 msgstr "Herinnering van je afspraak op "
 
 # calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Sluimeren"
 
@@ -1697,28 +1395,28 @@ msgid "Ok"
 msgstr "Ok"
 
 # calendar/gui/calendar-commands.c:434

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

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

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

 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1726,64 +1424,61 @@ msgstr "%a %d-%m-%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Publiekelijk"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Prive"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
 # shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
 # calendar/gui/print.c:326

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

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

-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1795,7 +1490,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1803,27 +1498,27 @@ msgstr "%d-%m-%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1833,577 +1528,252 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
 
 # calendar/gui/event-editor.c:1745

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

-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Error bij openen bestand: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Weergave"
+
+# calendar/gui/event-editor.c:298

+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Geef eindtijden afspraken weer"
+
+# composer/e-msg-composer.c:906

+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Bekijk bijvoegsels"
+
 # calendar/gui/print.c:1084

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

-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender weer zal geven"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:181

-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm op %A %b %d %Y %H:%M"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:188

-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Herinnering van de afspraak op %A %b %d %Y %H:%M"
 
 # calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Geen samenvatting beschikbaar."
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Sluiten"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:9

-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Afspraak bewerken"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:10

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

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minuten"
-
-# calendar/gui/getdate.y:426

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Vrij"
-
-# calendar/gui/getdate.y:413

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "Vrijdag"
-
-# calendar/gui/calendar-commands.c:60

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

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Maa"
-
-# calendar/gui/prop.c:348

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Maandag"
-
-# calendar/gui/prop.c:642

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

-# mail/message-list.c:474

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioriteit"
-
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Zat"
-
-# calendar/gui/getdate.y:414

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Weergeven"
-
-# calendar/gui/event-editor.c:298

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

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

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

-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Zon"
-
-# calendar/gui/prop.c:347

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Zondag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "TaakBlad"
-
-# calendar/gui/gnome-month-item.c:740

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Don"
-
-# calendar/gui/getdate.y:410

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Donderdag"
-
-# calendar/gui/prop.c:606

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

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

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Din"
-
-# calendar/gui/getdate.y:406

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-# calendar/gui/prop.c:780

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Woe"
-
-# calendar/gui/getdate.y:408

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "Woensdag"
-
-# calendar/gui/getdate.y:423

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

-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "seconden."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Weet u zeker dat u dit contact\n"
 "wilt verwijderen?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% Af:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "C_lassificatie:"
-
-# filter/filter-editor.c:212

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

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

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

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

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

-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Geen"
-
-# addressbook/printing/e-contact-print.glade.h:28

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

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

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

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

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

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "taak-bewerkings-dialoogvenster"
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Taak Bewerken"
 
 # calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Geen opsomming"
 
 # calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, 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:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, 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:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, 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:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
 
-#: calendar/gui/e-calendar-table.c:336
+# addressbook/contact-editor/categories-strings.h:7

+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "CategorieКn"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Classificatie"
+
+# calendar/gui/goto.c:264

+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Afmaak datum"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Eind Datum"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Sta_rt Datum:"
+
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Verloop Datum"
+
+#: calendar/gui/e-calendar-table.c:160
+#, fuzzy
+msgid "Geographical Position"
+msgstr "Geografische positie"
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Percentage af"
+
+# calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

+# mail/message-list.c:474

+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioriteit"
+
+# calendar/gui/gncal-todo.c:425

+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "S_amenvatting"
+
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
+msgstr "Transparantheid"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+# calendar/gui/prop.c:780

+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmen"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Open de taak"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Markeer als Gedaan"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 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:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Verwijderen"
+
 # addressbook/contact-editor/e-contact-editor.c:853

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

-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Verwijder de taak"
 
 # calendar/gui/e-day-view-time-item.c:391

-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
@@ -2411,36 +1781,36 @@ 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 # calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

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

 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
@@ -2448,371 +1818,195 @@ msgstr "pm"
 # calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324

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

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

-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 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:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 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:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 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:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 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:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 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:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
+
+# addressbook/contact-editor/categories-strings.h:7

+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"CategorieКn: "
+
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kon de kalender in `%s' niet laden"
+
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
+
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "_Gebeurtenis die de gehele dag plaatsvind"
-
-# calendar/gui/calendar-commands.c:59

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
+# calendar/gui/prop.c:348

+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Maandag"
+
+# calendar/gui/getdate.y:406

+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+# calendar/gui/getdate.y:408

+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Woensdag"
+
+# calendar/gui/getdate.y:410

+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Donderdag"
+
+# calendar/gui/getdate.y:413

+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Vrijdag"
+
+# calendar/gui/getdate.y:414

+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Zaterdag"
+
+# calendar/gui/prop.c:347

+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Zondag"
+
 # calendar/gui/getdate.y:421

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

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

-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/event-editor.c:833
+#: 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:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kon de kalender in `%s' niet laden"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kon kalender niet in aanmaken in `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Kon map `%s' niet openen:\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
 
-# calendar/gui/getdate.y:394

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "april"
-
-# calendar/gui/getdate.y:398

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

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

-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "februari"
-
-# calendar/gui/goto.c:264

-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Ga naar datum"
-
-# calendar/gui/goto.c:312

-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Ga naar vandaag"
-
-# calendar/gui/getdate.y:391

-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "januari"
-
-# calendar/gui/getdate.y:397

-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "juli"
+# calendar/gui/gnome-month-item.c:736

+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Zon"
 
-# calendar/gui/getdate.y:396

-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "juni"
+# calendar/gui/gnome-month-item.c:737

+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Maa"
 
-# calendar/gui/getdate.y:393

-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "maart"
+# calendar/gui/gnome-month-item.c:738

+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Din"
 
-# calendar/gui/prop.c:348

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

+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Woe"
 
-# calendar/gui/getdate.y:402

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

+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Don"
 
-# calendar/gui/getdate.y:401

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

+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Vrij"
 
-# calendar/gui/getdate.y:399

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

+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Zat"
 
 # addressbook/backend/ebook/load-pine-addressbook.c:41
 # addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kon Bonobo niet initialiseren"
@@ -3051,10 +2245,16 @@ msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 # calendar/gui/print.c:1249

-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
+# calendar/gui/control-factory.c:136

+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "De URI die de kalender weer zal geven"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
@@ -3151,62 +2351,72 @@ msgid "Could not load %s: No initialization code in module."
 msgstr "Kon %s niet laden: Geen initialisatie code in de module."
 
 # mail/mail-config.c:1658

-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+# filter/filter-editor.c:212

+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Geannuleerd"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Server verbrak de verbinding."
+# calendar/gui/calendar-commands.c:456

+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Open kalender"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaam gedeelte nodig"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een computernaam gedeelte nodig"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een pad gedeelte nodig"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Computer %s niet gevonden."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
 # shell/e-setup.c:69

-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3215,17 +2425,17 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL `%s' bevat geen protocol"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL `%s' bevat een ongeldig protocol"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Poort nummer in URL `%s' is niet numeriek"
@@ -3243,41 +2453,42 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Slechte authenticatie respons van server."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwachte respons van IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP commando mislukt: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "De respons van de IMAP server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP Server gaf onverwacht een 'OK' respons: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3289,29 +2500,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
 "Kerberos 4 authenticatie."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3323,30 +2534,32 @@ msgstr ""
 "\n"
 
 # shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "UNIX MH-formaat post directories"
 
 #: 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)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: 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)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
+msgstr "UNIX mbox-formaat post bestanden"
 
 #: camel/providers/local/camel-local-provider.c:59
 msgid "For storing local mail in qmail maildir directories"
@@ -3692,8 +2905,8 @@ msgid ""
 msgstr ""
 "Het wachtwoord zal naar de NNTP server worden verstuurd in platte tekst vorm."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
@@ -3724,7 +2937,7 @@ msgstr ""
 "Voor het verbinden met POP servers. Het POP protocol kan ook gebruikt worden "
 "om post te halen van bepaalde 'web mail' providers en gesloten post systemen."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3733,7 +2946,7 @@ msgstr ""
 "vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
 "servers."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3743,29 +2956,29 @@ msgstr ""
 "wachtwoord via het APOP protocol. Deze optie zal niet werken voor alle "
 "gebruikers op servers die te kennen geven het te ondersteunen."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dit zal verbinden met de POP server en gebruik maken van Kerberos 4 bij het "
 "aanmelden."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kon niet aanmelden bij KPOP server: %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 "Kon niet verbinden met POP server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVoer het POP3 wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3775,12 +2988,12 @@ msgstr ""
 "Fout bij versturen van gebruikersnaam: %s"
 
 # shell/e-storage.c:434

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

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

-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Authenticatie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3889,13 +3096,12 @@ msgstr ""
 "vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
 "servers."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
@@ -3904,97 +3110,97 @@ msgstr ""
 "Kerberos 4 authenticatie."
 
 # mail/mail-config.c:1658

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

-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -4046,13 +3252,12 @@ msgstr "bijvoegsel"
 
 # composer/e-msg-composer.c:951

 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Voeg een bestand bij"
 
 # composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333

-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -4071,68 +3276,49 @@ msgstr "Bestand bijvoegen..."
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
-# composer/e-msg-composer-attachment.glade.h:7

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Attachment eigenschappen"
-
-# composer/e-msg-composer-attachment.glade.h:10

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

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

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

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

-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Aan:"
 
 # composer/e-msg-composer-hdrs.c:217

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

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

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

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

-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4141,12 +3327,12 @@ msgstr ""
 "op de geadresseerden-lijst van het bericht verschijnen."
 
 # composer/e-msg-composer-hdrs.c:234

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

-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
@@ -4160,41 +3346,41 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:463

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

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

-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzigingen aan bericht..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Wijzigingen aan bericht opslaan..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, 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:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4205,32 +3391,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

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

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

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

-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 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:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4239,32 +3425,27 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 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:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
 # mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
 "aanmaken."
 
 # mail/component-factory.c:196

-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 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:176
-msgid "Sear_ch"
-msgstr "_Zoeken"
-
 # calendar/gui/getdate.y:420

 #: filter/filter-datespec.c:62
 msgid "year"
@@ -4419,7 +3600,7 @@ msgid "outgoing"
 msgstr "Uitgaand"
 
 # filter/filter-editor.c:198

-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Filters Bewerken"
 
@@ -4530,211 +3711,188 @@ msgstr ""
 msgid "Read"
 msgstr "Gelezen"
 
-# filter/filter-editor.c:198

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "bestaat"
+# calendar/gui/print.c:326

+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Score"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

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

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

+# mail/message-list.c:460

 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
+msgid "Set Status"
+msgstr "Stel Status in"
 
-# addressbook/gui/component/alphabet.glade.h:17

+# mail/mail-config.c:1490

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

+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "is niet"
+msgid "Stop Processing"
+msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Bericht"
+# mail/message-list.c:495

+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Onderwerp"
 
+# filter/filter-editor.c:198

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

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

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

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

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

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

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

 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Geaddresseerden"
+msgid "does not start with"
+msgstr "begint niet met"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr "Overeenkomende Regex"
+msgid "ends with"
+msgstr "eindigt op"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# calendar/gui/getdate.y:441

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

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

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

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

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

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

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

 #: filter/libfilter-i18n.h:43
@@ -4755,11 +3913,6 @@ msgstr "Regel Toevoegen"
 msgid "Edit Score Rule"
 msgstr "Bewerk Score Regel"
 
-# calendar/gui/print.c:326

-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Score"
-
 # filter/filter-editor.c:198

 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
@@ -4771,171 +3924,134 @@ msgid "Edit VFolder Rule"
 msgstr "Bewerk VMap Regel"
 
 # mail/component-factory.c:196

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

-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Opslaan"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Selecteer Map"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Bericht of onderwerp bevat"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Bericht bevat"
 
 # mail/message-list.c:495

-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Bericht bevat niet"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Allen Weergeven"
-
-# addressbook/contact-editor/e-contact-editor.c:852

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

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

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

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

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

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

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

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

+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Bewerken"
+
 # composer/e-msg-composer.c:463

-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:660
 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:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Afdrukken"
 
 # mail/folder-browser-factory.c:35

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

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

-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Doorsturen"
 
 # calendar/gui/calendar-commands.c:554

-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ga vooruit in tijd"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 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:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
 # shell/e-shell-view-menu.c:402

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

-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 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:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Terughalen"
 
@@ -4943,80 +4059,53 @@ 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-# composer/e-msg-composer.c:894

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

-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Onderwerp is %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Bezig met vergaren opslag voor \"%s\""
+# shell/e-shell-view.c:596

+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Geen"
 
-# calendar/gui/event-editor.c:294

-#: mail/local-config.glade.h:7
+# calendar/gui/prop.c:836

+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "Samenvatting postvak"
+msgid " (default)"
+msgstr "Standaardwaarde"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10

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

-#: mail/local-config.glade.h:8
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
 #, fuzzy
-msgid "New store format:"
-msgstr "Nieuws bron type:"
+msgid "Evolution Account Manager"
+msgstr "Account Beheer"
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
-
-#: mail/local-config.glade.h:10
-msgid "maildir"
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-#, fuzzy
-msgid "mbox"
-msgstr "Postvak In"
-
-# addressbook/gui/component/alphabet.glade.h:16

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

-#: mail/local-config.glade.h:12
+# shell/e-shell-view-menu.c:369

+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Evolution ToDo Kanaal"
 
 # mail/mail-config.c:1199

 #: mail/mail-autofilter.c:71
@@ -5041,7 +4130,7 @@ msgstr "Post ophalen van %s"
 msgid "%s mailing list"
 msgstr "%s mailing lijst"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5053,7 +4142,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil je nu het programma configureren?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5061,7 +4150,7 @@ msgstr ""
 "Je moet een identiteit configuren\n"
 "voordat je post kunt versturen."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5069,20 +4158,16 @@ msgstr ""
 "Je moet een post transport configuren\n"
 "voordat je een e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "Je hebt geen post bronnen geconfigureerd"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post transport methode ingesteld"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Er is geen \"Postvak uit\" geconfigureerd"
 
 # mail/mail-ops.c:386

-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5090,27 +4175,34 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Je moet een identiteit configuren\n"
+"voordat je post kunt versturen."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
 # mail/folder-browser-factory.c:37

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

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

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

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

-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5149,532 +4241,32 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-#, fuzzy
-msgid "Account"
-msgstr "Accounts"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Identiteit"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Mail"
-msgstr "Post"
-
-# addressbook/contact-editor/e-contact-editor.c:808

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

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

-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "Post Configuratie"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config-druid.glade.h:43
-msgid "Mail Configuration Druid"
-msgstr "Post Configuratie Druide"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr "Stel dit in als standaard account"
-
-# shell/e-shell-view-menu.c:398

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Type:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

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

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

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

-#: mail/mail-config-gui.c:433
-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 ""
-"Geef de naam en e-mail adres op voor uitgaande mail. Je kan ook de naam van "
-"het het bedrijf oppgeven, en de naam van het bestand waar je signature in "
-"staat."
-
-# mail/mail-config.c:277

-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Volledige naam:"
-
-# mail/mail-config.c:305

-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-mail adres:"
-
-# mail/mail-config.c:345

-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Signatuur Bestand"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Server:"
-
-# mail/mail-config.c:751 mail/mail-config.c:831

-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Detecteer ondersteunde types..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Verwijder de berichten niet van de server"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Test Instellingen"
-
-# mail/mail-config.c:1220

-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Post bron type:"
-
-# mail/mail-config.c:960

-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:363
+#, c-format
 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."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Selecteer het soort postserver, en de overige benodigde infomatie.\n"
-"\n"
-"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-"types...\" klikken nadat je de overige informatie hebt ingevuld."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:10

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

-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Nieuws bron type:"
 
-# mail/mail-config.c:960

-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:629
+#, c-format
 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."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Selecteer het soort mailserver, en de overige benodigde informatie.\n"
-"\n"
-"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-"types...\" klikken nadat je de overige informatie hebt ingevuld."
 
-# mail/mail-config.c:1220

-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Mail transport type:"
-
-# mail/mail-config.c:960

-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"Selecteer het soort postserver, en de overige benodigde infomatie.\n"
-"\n"
-"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
-"types...\" klikken nadat je de overige informatie hebt ingevuld."
-
-# mail/mail-config.c:1345

-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Identiteit Toevoegen"
-
-# mail/mail-config.c:1343

-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Identiteit Bewerken"
-
-# mail/mail-config.c:1490

-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Bron Toevoegen"
-
-# mail/mail-config.c:1488

-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Bron Bewerken"
-
-# mail/mail-config.c:1658

-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Nieuwe Nieuws Server Toevoegen"
-
-# mail/mail-config.c:1656

-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Bewerk Nieuws Server"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Bezig met Testen \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Test verbinding naar \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "De verbinding was successvol!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Bezig met uitzoeken van aanmeldings mogelijkheden van \"%s\""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
-
-# composer/e-msg-composer-address-dialog.glade.h:11

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

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

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

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

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

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

-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organisatie"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Stuur berichten in HTML formaat"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Voer je PGP/GPG passphrase in."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Geen wachtwoord ingevoerd."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
-
-# calendar/gui/event-editor.c:294

-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Geen GPG/PGP programma beschikbaar."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kon de pipe niet maken: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -5716,69 +4308,70 @@ msgstr "Openen in %s..."
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, 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:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Verbergen"
 
 # composer/e-msg-composer-attachment-bar.c:299

-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijvoegsel"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
+# mail/folder-browser-factory.c:34

+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Antwoord-Naar:"
 
 # calendar/gui/prop.c:519

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

-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, 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:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
@@ -5843,7 +4436,7 @@ msgstr "Bezig met registreren lokale map"
 msgid "Register local folder"
 msgstr "Registreren lokale map"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5875,171 +4468,171 @@ msgid "Working"
 msgstr "Bezig met verplaatsen"
 
 # mail/mail-ops.c:374

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

-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe post op %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Bezig met op verzoek filteren van post"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filter post op verzoek"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Verzonden email-berichten"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Bezig met verzenden wachtrij"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Verzendings wachtrij"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Bezig met toevoegen \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiКren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, 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:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Bezig met kopiКren"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s bericht %d van %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:7

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

-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Doorgestuurd bericht:\n"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Bezig met Legen \"%s\""
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen berichten : %s"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Laad \"%s\" Map"
 
 # composer/e-msg-composer.c:1127

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

-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6052,7 +4645,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 # mail/mail-threads.c:621

-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
@@ -6173,126 +4766,211 @@ msgstr "Nieuwe VMap"
 # mail/folder-browser-factory.c:34

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

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

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

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

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

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

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

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

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

-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<onbekend>"
 
 # calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
 # calendar/gui/event-editor.c:1745

-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Gevlagd"
+
+# composer/e-msg-composer-attachment-bar.c:299

+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "bijvoegsel"
+
+# mail/message-list.c:488

+#: mail/message-list.c:1110
+msgid "From"
+msgstr "Van"
+
+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Verloop Datum"
+
+# mail/message-list.c:509

+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Ontvangst datum"
+
+# mail/message-list.c:516

+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Aan"
+
+# mail/message-list.c:523

+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Grootte"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Voer je PGP/GPG passphrase in."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Voer je PGP/GPG passphrase in."
+
+# calendar/gui/event-editor.c:294

+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Geen GPG/PGP programma beschikbaar."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Geen wachtwoord ingevoerd."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kon de pipe niet maken: %s"
+
+# shell/e-shell-view.c:208

+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Mappen"
+
+# calendar/gui/print.c:326

+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Score"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Geef mappen weer die beginnen met:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Bezig met vergaren opslag voor \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Bezig met vergaren opslag voor \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Bezig met afmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Afmelden bij map \"%s\""
@@ -6418,27 +5096,28 @@ msgid "New..."
 msgstr "Nieuw..."
 
 # shell/e-shell-folder-title-bar.c:355

-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Geen)"
 
 # shell/e-shell-view-menu.c:110

-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy kon niet worden gevonden in het $PATH."
 
 # shell/e-shell-view-menu.c:116

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

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

-#: 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"
@@ -6449,7 +5128,7 @@ msgstr ""
 "in de GNOME werkomgeving."
 
 # shell/e-shell-view-menu.c:301

-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
@@ -6459,14 +5138,20 @@ msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
 # shell/e-shell-view.c:208

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

-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+# shell/e-shell-view.c:600

+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 # shell/e-shell.c:299

@@ -6475,7 +5160,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6485,16 +5170,16 @@ msgstr ""
 "Dit betekent waarschijnlijk dat het %s component is gecrashed"
 
 # addressbook/gui/component/addressbook.c:420

-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelings groep aanmaken"
 
 # mail/mail-config.c:277

-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Groep:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6503,60 +5188,72 @@ msgstr ""
 "Wil je echt de groep `%s' verwijderen\n"
 "van de snelkoppelingsbalk?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
 # shell/e-shortcuts-view.c:235

-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Kleine Iconen"
 
 # shell/e-shortcuts-view.c:236

-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine iconen"
 
 # shell/e-shortcuts-view.c:238

-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Grote Iconen"
 
 # shell/e-shortcuts-view.c:239

-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote iconen"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
 # addressbook/gui/component/addressbook.c:420

-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Deze Groep _Verwijderen..."
 
 # shell/e-shortcuts-view.c:333

-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
+# shell/e-shell-view-menu.c:419

+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Snelkoppelingenbalk Tonen"
+
+# shell/e-shell-view-menu.c:419

+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Snelkoppelingenbalk Tonen"
+
 # shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activeren"
 
 # shell/e-shortcuts-view.c:330

-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activeer deze snelkoppeling"
 
 # shell/e-shortcuts-view.c:333

-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
@@ -6566,13 +5263,12 @@ msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 # shell/e-shell-view-menu.c:398

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

-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Geef de geselecteerde map weer"
 
@@ -6701,1547 +5397,2651 @@ msgstr "Uitzetten."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-# shell/e-shell-view-menu.c:404

-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Nieuw contact maken"
+# addressbook/contact-editor/e-contact-editor.c:643

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

+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Afspraak"
+
+# addressbook/contact-editor/e-contact-editor.c:644

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

+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Verzoek tot Vergadering"
+
+# addressbook/contact-editor/e-contact-editor.c:646

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

+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Mail bericht"
+
+# addressbook/contact-editor/e-contact-editor.c:647

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

+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:648

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

+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Taak"
+
+# addressbook/contact-editor/e-contact-editor.c:649

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

+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Taak Verzoek"
+
+# addressbook/contact-editor/e-contact-editor.c:650

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

+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Dagboek Item"
+
+# addressbook/contact-editor/e-contact-editor.c:651

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

+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: Aanteke_ning"
+
+# addressbook/contact-editor/e-contact-editor.c:653

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

+# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Seleecteer F_ormulier"
+
+# addressbook/contact-editor/e-contact-editor.c:658

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

+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: _Memo Stijl"
+
+# addressbook/contact-editor/e-contact-editor.c:660

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

+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: DefiniКer Print _Stijlen..."
+
+# addressbook/contact-editor/e-contact-editor.c:667

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

+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: V_ersturen"
+
+# calendar/gui/event-editor.c:1333

+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Aanhangels Opslaan..."
+
+# addressbook/contact-editor/e-contact-editor.c:674

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

+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: Verplaats naar Folder..."
+
+# addressbook/contact-editor/e-contact-editor.c:675

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

+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopieer naar Folder..."
+
+# addressbook/contact-editor/e-contact-editor.c:677

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

+#: ui/evolution-contact-editor.xml:41
+msgid "Page Set_up"
+msgstr "Pagina instellingen"
+
+# addressbook/contact-editor/e-contact-editor.c:678

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

+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Afdruk_voorbeeld"
+
+# addressbook/contact-editor/e-contact-editor.c:699

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

+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Plakken _Speciaal..."
+
+# addressbook/contact-editor/e-contact-editor.c:704

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

+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Markeer Als Ongelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:708

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

+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Object"
+
+# addressbook/contact-editor/e-contact-editor.c:713

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

+# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: _Item"
+
+# addressbook/contact-editor/e-contact-editor.c:714

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

+# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Ongelezen Item"
+
+# addressbook/contact-editor/e-contact-editor.c:715

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

+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Ee_rste Item in Folder"
+
+# addressbook/contact-editor/e-contact-editor.c:722

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

+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Laatste Item in Folder"
+
+# addressbook/contact-editor/e-contact-editor.c:727

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

+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standaard"
+
+# addressbook/contact-editor/e-contact-editor.c:729

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

+#: ui/evolution-contact-editor.xml:93
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Opmaak"
+
+# addressbook/contact-editor/e-contact-editor.c:732

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

+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Aanpassen..."
+
+# addressbook/contact-editor/e-contact-editor.c:737

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

+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Vorige"
+
+# addressbook/contact-editor/e-contact-editor.c:738

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

+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "Volgende"
+
+# addressbook/contact-editor/e-contact-editor.c:740

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

+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Werkbalk"
+
+# addressbook/contact-editor/e-contact-editor.c:745

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

+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: Bestand..."
+
+# addressbook/contact-editor/e-contact-editor.c:746

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

+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: It_em..."
+
+# addressbook/contact-editor/e-contact-editor.c:747

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

+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Object..."
+
+# addressbook/contact-editor/e-contact-editor.c:752

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

+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Font..."
+
+# addressbook/contact-editor/e-contact-editor.c:753

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

+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Paragraaf..."
+
+# addressbook/contact-editor/e-contact-editor.c:760

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

+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Ontwerp dit Formulier"
+
+# addressbook/contact-editor/e-contact-editor.c:761

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

+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ontw_erp een Formulier..."
+
+# addressbook/contact-editor/e-contact-editor.c:763

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

+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publiceer een _Formulier..."
+
+# addressbook/contact-editor/e-contact-editor.c:764

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

+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_bliceer een Formulier als..."
+
+# addressbook/contact-editor/e-contact-editor.c:766

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

+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Script _Debugger"
+
+# addressbook/contact-editor/e-contact-editor.c:771

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

+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Spelling..."
+
+# addressbook/contact-editor/e-contact-editor.c:773

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

+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Formulier"
+
+# addressbook/contact-editor/e-contact-editor.c:778

+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "FIXME: _Nieuw Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:779

+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
+
+# addressbook/contact-editor/e-contact-editor.c:781

+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: Nieuwe Brief naar Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:781

+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: Nieuwe Brief naar Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:783

+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Nieuwe Afspraak met Contact"
+
+# addressbook/contact-editor/e-contact-editor.c:784

+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: Een Afspraak _Plannen..."
+
+# addressbook/contact-editor/e-contact-editor.c:785

+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: Nieuwe _Taak for contact"
+
+# addressbook/contact-editor/e-contact-editor.c:786

+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: Nieuwe Dagboek "
+
+# addressbook/contact-editor/e-contact-editor.c:788

+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: _Vlag voor Vervolg..."
+
+# addressbook/contact-editor/e-contact-editor.c:789

+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: Toon Folder met Adressen"
+
+# addressbook/contact-editor/e-contact-editor.c:790

+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: Pagina Bekijken"
+
+# addressbook/contact-editor/e-contact-editor.c:792

+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Doorsturen als _vCard"
+
+# addressbook/contact-editor/e-contact-editor.c:793

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

+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: Doorsturen"
+
+# addressbook/contact-editor/e-contact-editor.c:805

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

+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Invoegen"
+
+# addressbook/contact-editor/e-contact-editor.c:806

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

+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "_Opmaak"
+
+# addressbook/contact-editor/e-contact-editor.c:807

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

+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Gereedschap"
+
+# shell/e-shell-view-menu.c:474

+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Ac_ties"
+
+# addressbook/contact-editor/e-contact-editor.c:856

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

+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "FIXME: Vorige"
+
+# addressbook/contact-editor/e-contact-editor.c:857

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

+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Ga naar het vorige item"
+
+# addressbook/contact-editor/e-contact-editor.c:859

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

+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "FIXME: Volgende"
+
+# addressbook/contact-editor/e-contact-editor.c:860

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

+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Ga naar het volgende item"
+
+# 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:2471
+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"
+msgstr "Experimenteel"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:387

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Bezig"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:388

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Uit het Kantoor"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Geen informatie"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:405

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "Nod_ig anderen uit..."
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:425

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opties"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:442

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "T_oon alleen werkuren"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:455

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Toon Uitge_zoomd"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:473

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Update Vrij/Druk"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:491

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:508

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_Automatisch uitzoeken"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:522

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:539

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Alle mensen en bronnen"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:552

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle _mensen en een bron"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Benodigde Mensen"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:578

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Vereiste mensen en een br_on"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:601

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Begintijd _vergadering:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:625

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "_Eindtijd vergadering:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:738

+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle Gasten"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MDWDVZZ"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+# widgets/misc/e-clipped-label.c:106

+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+# addressbook/gui/component/addressbook.c:420

+# calendar/gui/calendar-commands.c:544

+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Nu"
+
+# calendar/gui/calendar-commands.c:553

+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Vandaag"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+# composer/e-msg-composer-address-dialog.glade.h:9

+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "_Zoeken"
+
+# widgets/shortcut-bar/e-group-bar.c:632

+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Group %i"
 
 # addressbook/gui/component/addressbook.c:426

-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Selecteer een contact"
+#~ msgid "Delete Contact?"
+#~ msgstr "Contact verwijderen?"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:18

+#~ msgid "Address _2:"
+#~ msgstr "Adres _2:"
+
+#~ msgid "Canada"
+#~ msgstr "Canada"
+
+# composer/e-msg-composer-address-dialog.glade.h:11

+#~ msgid "Check Address"
+#~ msgstr "Controleer Adres"
+
+#~ msgid "Countr_y:"
+#~ msgstr "_Land:"
 
 # addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Vinden"
+#~ msgid "Finland"
+#~ msgstr "Finland"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:18

+#~ msgid "_Address:"
+#~ msgstr "_Adres:"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:36

+#~ msgid "_City:"
+#~ msgstr "_Gemeente:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "_Postbus:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "_Staat/Provincie:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Postcode:"
+
+# mail/mail-config.c:1490

+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "Bron Toevoegen"
+
+#, fuzzy
+#~ msgid "URI"
+#~ msgstr "URL"
 
 # addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Zoek een contact"
+#~ msgid "Find..."
+#~ msgstr "Vind..."
+
+# composer/e-msg-composer-address-dialog.glade.h:7

+#~ msgid "Message Recipients"
+#~ msgstr "Geaddresseerden"
+
+#~ msgid "Select Names"
+#~ msgstr "Selecteer namen"
+
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "Selecteer naam uit lijst:"
+
+# addressbook/gui/component/alphabet.glade.h:8

+#~ msgid "123"
+#~ msgstr "123"
+
+# addressbook/gui/component/alphabet.glade.h:9

+#~ msgid "a"
+#~ msgstr "a"
+
+# addressbook/gui/component/alphabet.glade.h:10

+#~ msgid "b"
+#~ msgstr "b"
+
+# addressbook/gui/component/alphabet.glade.h:11

+#~ msgid "c"
+#~ msgstr "c"
+
+# addressbook/gui/component/alphabet.glade.h:12

+#~ msgid "d"
+#~ msgstr "d"
+
+# addressbook/gui/component/alphabet.glade.h:13

+#~ msgid "e"
+#~ msgstr "e"
+
+# addressbook/gui/component/alphabet.glade.h:14

+#~ msgid "f"
+#~ msgstr "f"
+
+# addressbook/gui/component/alphabet.glade.h:15

+#~ msgid "g"
+#~ msgstr "g"
+
+# addressbook/gui/component/alphabet.glade.h:16

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

+#~ msgid "h"
+#~ msgstr "h"
+
+# addressbook/gui/component/alphabet.glade.h:17

+#~ msgid "i"
+#~ msgstr "i"
+
+# addressbook/gui/component/alphabet.glade.h:18

+#~ msgid "j"
+#~ msgstr "j"
+
+# addressbook/gui/component/alphabet.glade.h:19

+#~ msgid "k"
+#~ msgstr "k"
+
+# addressbook/gui/component/alphabet.glade.h:20

+#~ msgid "l"
+#~ msgstr "l"
+
+# addressbook/gui/component/alphabet.glade.h:21

+#~ msgid "m"
+#~ msgstr "m"
+
+# addressbook/gui/component/alphabet.glade.h:22

+#~ msgid "n"
+#~ msgstr "n"
+
+# addressbook/gui/component/alphabet.glade.h:23

+#~ msgid "o"
+#~ msgstr "o"
+
+# addressbook/gui/component/alphabet.glade.h:24

+#~ msgid "p"
+#~ msgstr "p"
+
+# addressbook/gui/component/alphabet.glade.h:25

+#~ msgid "q"
+#~ msgstr "q"
+
+# addressbook/gui/component/alphabet.glade.h:26

+#~ msgid "r"
+#~ msgstr "r"
+
+# addressbook/gui/component/alphabet.glade.h:27

+#~ msgid "s"
+#~ msgstr "s"
+
+# addressbook/gui/component/alphabet.glade.h:28

+#~ msgid "t"
+#~ msgstr "t"
+
+# addressbook/gui/component/alphabet.glade.h:29

+#~ msgid "u"
+#~ msgstr "u"
+
+# addressbook/gui/component/alphabet.glade.h:30

+#~ msgid "v"
+#~ msgstr "v"
+
+# addressbook/gui/component/alphabet.glade.h:31

+#~ msgid "w"
+#~ msgstr "w"
+
+# addressbook/gui/component/alphabet.glade.h:32

+#~ msgid "x"
+#~ msgstr "x"
+
+# addressbook/gui/component/alphabet.glade.h:33

+#~ msgid "y"
+#~ msgstr "y"
+
+# addressbook/gui/component/alphabet.glade.h:34

+#~ msgid "z"
+#~ msgstr "z"
+
+# addressbook/printing/e-contact-print.glade.h:23

+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 punts Tahoma"
+
+# addressbook/printing/e-contact-print.glade.h:25

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

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

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

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

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

+#~ msgid "Dimensions:"
+#~ msgstr "Dimensies:"
+
+# 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 "Lettertype..."
+
+# addressbook/printing/e-contact-print.glade.h:19

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+# addressbook/printing/e-contact-print.glade.h:33

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

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

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

+#~ msgid "label26"
+#~ msgstr "label26"
+
+# calendar/gui/calendar-commands.c:659

+#, fuzzy
+#~ msgid "Calendar Server"
+#~ msgstr "Kalender"
+
+# mail/component-factory.c:196

+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr ""
+#~ "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
+
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution Kalender Kanaal"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:9

+#~ msgid "Edit appointment"
+#~ msgstr "Afspraak bewerken"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:10

+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Sluimer tijd (minuten)"
+
+# calendar/gui/getdate.y:426

+#~ msgid "05 minutes"
+#~ msgstr "05 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "10 minutes"
+#~ msgstr "10 minuten"
+
+# calendar/gui/prop.c:335

+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 uurs (am/pm)"
+
+# calendar/gui/getdate.y:426

+#~ msgid "15 minutes"
+#~ msgstr "15 minuten"
+
+# calendar/gui/prop.c:336

+#~ msgid "24 hour"
+#~ msgstr "24 uurs"
+
+# calendar/gui/getdate.y:426

+#~ msgid "30 minutes"
+#~ msgstr "30 minuten"
+
+# calendar/gui/getdate.y:426

+#~ msgid "60 minutes"
+#~ msgstr "60 minuten"
+
+# calendar/gui/prop.c:803

+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarm stopt na"
+
+# calendar/gui/prop.c:780

+#~ msgid "Audio Alarms"
+#~ msgstr "Audio Alarmen"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Piep als het alarm venster verschijnt."
+
+# calendar/gui/calendar-commands.c:659

+#~ msgid "Calendar"
+#~ msgstr "Kalender"
+
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalender Instellingen"
+
+# calendar/gui/prop.c:522

+#~ msgid "Colors"
+#~ msgstr "Kleuren"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Weekeinden comprimeren"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Datum navigator instellingen"
+
+# calendar/gui/prop.c:836

+#~ msgid "Defaults"
+#~ msgstr "Standaard instellingen"
+
+#~ msgid "Display options"
+#~ msgstr "Weergave instellingen"
+
+# calendar/gui/prop.c:820

+#~ msgid "Enable snoozing for"
+#~ msgstr "Maak sluimeren mogelijk voor"
+
+#~ msgid "End of day:"
+#~ msgstr "Eind van dag:"
+
+#~ msgid "First day of week:"
+#~ msgstr "Eerste dag van de week:"
+
+# calendar/gui/calendar-commands.c:60

+#~ msgid "Highlight"
+#~ msgstr "Markeer"
+
+# calendar/gui/prop.c:648

+#~ msgid "Items Due Today"
+#~ msgstr "Items die vandaag verlopen"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Items die vandaag verlopen:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Items die nog niet zijn verlopen"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Items die nog niet zijn verlopen:"
+
+# calendar/gui/prop.c:642

+#~ msgid "Overdue Items"
+#~ msgstr "Verlopen items"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Verlopen items:"
+
+#~ msgid "Pick a color"
+#~ msgstr "Kies een kleur"
+
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

+#~ msgid "Remind me of all appointments"
+#~ msgstr "Herinner me van alle afspraken"
+
+#~ msgid "Reminders"
+#~ msgstr "Herinneringen"
+
+#~ msgid "Show"
+#~ msgstr "Weergeven"
+
+# calendar/gui/calendar-commands.c:528

+#~ msgid "Show week numbers"
+#~ msgstr "Geef weeknummers weer"
+
+# calendar/gui/goto.c:264

+#~ msgid "Start of day:"
+#~ msgstr "Start van dag:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaakBlad"
+
+# calendar/gui/prop.c:606

+#~ msgid "Time Until Due"
+#~ msgstr "Tijd Tot Verlooptijd"
+
+# calendar/gui/e-day-view-time-item.c:391

+#~ msgid "Time divisions:"
+#~ msgstr "Tijd delingen:"
+
+# calendar/gui/prop.c:334

+#~ msgid "Time format:"
+#~ msgstr "Tijdsformaat:"
+
+# calendar/gui/prop.c:780

+#~ msgid "Visual Alarms"
+#~ msgstr "Visuele Alarmen"
+
+# calendar/gui/getdate.y:423

+#~ msgid "Work week"
+#~ msgstr "Werk week"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuten voor ze plaatsvinden."
+
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831

+#~ msgid "seconds."
+#~ msgstr "seconden."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Af:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassificatie:"
+
+#~ msgid "Completed"
+#~ msgstr "Gedaan"
+
+# calendar/gui/gncal-todo.c:207

+#~ msgid "Date Completed:"
+#~ msgstr "Datum Afgemaakt:"
+
+# addressbook/printing/e-contact-print.glade.h:34

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

+#~ msgid "High"
+#~ msgstr "Hoog"
+
+#~ msgid "In Progress"
+#~ msgstr "In Uitvoer"
+
+# calendar/gui/getdate.y:438

+#~ msgid "Low"
+#~ msgstr "Laag"
+
+# addressbook/printing/e-contact-print.glade.h:28

+#~ msgid "Normal"
+#~ msgstr "Normaal"
+
+#~ msgid "Not Started"
+#~ msgstr "Niet Gestart"
+
+#~ msgid "Task"
+#~ msgstr "_Taak"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:26

+#~ msgid "_Contacts..."
+#~ msgstr "C_ontacten..."
+
+# addressbook/contact-editor/e-contact-editor-strings.h:31

+#~ msgid "_Due Date:"
+#~ msgstr "_Verloop Datum:"
+
+# calendar/gui/gncal-todo.c:190

+#~ msgid "_Priority:"
+#~ msgstr "_Prioriteit:"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:35

+#~ msgid "_Status:"
+#~ msgstr "_Status:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "taak-bewerkings-dialoogvenster"
+
+#~ msgid "A_ll day event"
+#~ msgstr "_Gebeurtenis die de gehele dag plaatsvind"
+
+# calendar/gui/calendar-commands.c:59

+#~ msgid "Appointment Basics"
+#~ msgstr "Afspraak Basis:"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Aangepaste herhaling"
+
+# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

+#~ msgid "Days"
+#~ msgstr "Dagen"
+
+#~ msgid "Every"
+#~ msgstr "Elke"
+
+#~ msgid "Exceptions"
+#~ msgstr "Uitzonderingen"
+
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+#~ msgid "Hours"
+#~ msgstr "Uren"
+
+# mail/mail-config.c:1199

+#~ msgid "Mail _to:"
+#~ msgstr "Post _naar:"
+
+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

+#~ msgid "Minutes"
+#~ msgstr "Minuten"
+
+# calendar/gui/prop.c:348

+#~ msgid "Modify"
+#~ msgstr "Aanpassen"
+
+#~ msgid "No recurrence"
+#~ msgstr "Geen herhaling"
+
+# addressbook/printing/e-contact-print.glade.h:9

+#~ msgid "Preview"
+#~ msgstr "Voorbeeld"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vИ"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_bliekelijk"
+
+#~ msgid "Recurrence"
+#~ msgstr "Herhaling"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Herhalings Regel"
+
+#~ msgid "Reminder"
+#~ msgstr "Herinnering"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Eenvoudige herhaling"
+
+# calendar/gui/gncal-todo.c:171

+#~ msgid "Su_mmary:"
+#~ msgstr "Opso_mming:"
+
+# calendar/gui/gncal-todo.c:428

+#~ msgid "Time"
+#~ msgstr "Resterende tijd"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:7

+#~ msgid "_Audio"
+#~ msgstr "_Geluid"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Vertrouwelijk"
+
+#~ msgid "_End time:"
+#~ msgstr "_Eindtijd:"
+
+#~ msgid "_Mail"
+#~ msgstr "_Post"
+
+#~ msgid "_Program"
+#~ msgstr "_Programma"
+
+#~ msgid "_Run program:"
+#~ msgstr "P_rogramma starten:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:601

+#~ msgid "_Start time:"
+#~ msgstr "_Begintijd:"
+
+# calendar/gui/goto.c:264

+#~ msgid "_Starting date:"
+#~ msgstr "_Begin datum:"
+
+# calendar/gui/getdate.y:424

+#~ msgid "day(s)"
+#~ msgstr "dag(en)"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "gebeurtenis-bewerkings-dialoog"
+
+# calendar/gui/getdate.y:445

+#~ msgid "for"
+#~ msgstr "voor"
+
+#~ msgid "forever"
+#~ msgstr "oneindig"
+
+# widgets/e-table/e-table-group.glade.h:9

+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "maand(en)"
+
+# shell/e-shell-folder-title-bar.c:355

+#~ msgid "until"
+#~ msgstr "totdat"
+
+# calendar/gui/getdate.y:423

+#~ msgid "week(s)"
+#~ msgstr "week(en)"
+
+# calendar/gui/getdate.y:420

+#~ msgid "year(s)"
+#~ msgstr "jar(en)"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Kon kalender niet in aanmaken in `%s'"
+
+# calendar/gui/getdate.y:394

+#, fuzzy
+#~ msgid "April"
+#~ msgstr "april"
+
+# calendar/gui/getdate.y:398

+#, fuzzy
+#~ msgid "August"
+#~ msgstr "augustus"
+
+# calendar/gui/getdate.y:403

+#, fuzzy
+#~ msgid "December"
+#~ msgstr "december"
+
+# calendar/gui/getdate.y:392

+#, fuzzy
+#~ msgid "February"
+#~ msgstr "februari"
+
+# calendar/gui/goto.c:264

+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "Ga naar datum"
+
+# calendar/gui/goto.c:312

+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Ga naar vandaag"
+
+# calendar/gui/getdate.y:391

+#, fuzzy
+#~ msgid "January"
+#~ msgstr "januari"
+
+# calendar/gui/getdate.y:397

+#, fuzzy
+#~ msgid "July"
+#~ msgstr "juli"
+
+# calendar/gui/getdate.y:396

+#, fuzzy
+#~ msgid "June"
+#~ msgstr "juni"
+
+# calendar/gui/getdate.y:393

+#, fuzzy
+#~ msgid "March"
+#~ msgstr "maart"
+
+# calendar/gui/prop.c:348

+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Maandag"
+
+# calendar/gui/getdate.y:402

+#, fuzzy
+#~ msgid "November"
+#~ msgstr "november"
+
+# calendar/gui/getdate.y:401

+#, fuzzy
+#~ msgid "October"
+#~ msgstr "oktober"
+
+# calendar/gui/getdate.y:399

+#, fuzzy
+#~ msgid "September"
+#~ msgstr "september"
+
+#~ msgid "Server disconnected."
+#~ msgstr "Server verbrak de verbinding."
+
+#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
+#~ msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
+
+#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
+#~ msgstr "UNIX mbox-formaat post bestanden (CamelLocal versie)"
+
+#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#~ msgstr "UNIX qmail maildir-formaat e-mail bestanden (CamelLocal versie)"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+# composer/e-msg-composer-attachment.glade.h:7

+#~ msgid "Attachment properties"
+#~ msgstr "Attachment eigenschappen"
+
+# composer/e-msg-composer-attachment.glade.h:10

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

+#~ msgid "MIME type:"
+#~ msgstr "MIME type:"
+
+# filter/filter-editor.c:198

+#~ msgid "Edit VFolders"
+#~ msgstr "Bewerk VMappen"
+
+# mail/mail-config.c:1490

+#~ msgid "Filter Rules"
+#~ msgstr "Filter Regels"
+
+#~ msgid "Incoming"
+#~ msgstr "Inkomend"
+
+# calendar/gui/calendar-commands.c:56

+#~ msgid "Outgoing"
+#~ msgstr "Uitgaand"
+
+# mail/folder-browser-factory.c:89

+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuele Mappen"
+
+# mail/mail-config.c:1199

+#~ msgid "vFolder Sources"
+#~ msgstr "VMap Bronnen"
+
+# calendar/gui/print.c:326

+#~ msgid "Save"
+#~ msgstr "Opslaan"
+
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Allen Weergeven"
+
+# addressbook/contact-editor/e-contact-editor.c:852

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

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

+#, fuzzy
+#~ msgid "Hide selected"
+#~ msgstr "Verwijderd"
+
+# addressbook/printing/e-contact-print.glade.h:52

+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "Verbergen"
+
+# addressbook/contact-editor/e-contact-editor.c:852

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

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

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

+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Onderwerp"
+
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Filter op Afzender"
+
+# composer/e-msg-composer.c:894

+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Bericht Bewerken"
+
+# mail/message-list.c:495

+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Onderwerp is %s"
+
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Bezig met vergaren opslag voor \"%s\""
+
+# calendar/gui/event-editor.c:294

+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "Samenvatting postvak"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:10

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

+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Nieuws bron type:"
+
+#, fuzzy
+#~ msgid "mbox"
+#~ msgstr "Postvak In"
+
+# addressbook/gui/component/alphabet.glade.h:16

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

+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Je hebt geen post bronnen geconfigureerd"
+
+# addressbook/contact-editor/e-contact-editor.c:808

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

+#, fuzzy
+#~ msgid "Account"
+#~ msgstr "Accounts"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#~ msgid "Account Information"
+#~ msgstr "Account Informatie"
+
+# composer/e-msg-composer-attachment.glade.h:7

+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Attachment eigenschappen"
+
+# calendar/gui/gncal-todo.c:479

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

+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Geavanceerd..."
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#~ msgid "Authentication"
+#~ msgstr "Authenticatie"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "Authenticatie:"
+
+#, fuzzy
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
+
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "Verwijder de berichten niet van de server"
+
+# shell/e-shell-view.c:596

+#~ msgid "Done"
+#~ msgstr "Klaar"
+
+# mail/mail-config.c:305

+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-mail Adres:"
+
+# mail/mail-config.c:305

+#~ msgid "Email Address:"
+#~ msgstr "E-mail Adres:"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution Post Configuratie"
+
+# mail/mail-config.c:277

+#~ msgid "Full Name:"
+#~ msgstr "Volledige Naam:"
+
+# mail/mail-config.c:725

+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Gebruikersnaam:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+# mail/mail-config.c:1180

+#~ msgid "Identity"
+#~ msgstr "Identiteit"
+
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "Mail"
+#~ msgstr "Post"
+
+# addressbook/contact-editor/e-contact-editor.c:808

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

+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Accounts"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#~ msgid "Mail Configuration"
+#~ msgstr "Post Configuratie"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Post Configuratie Druide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Stel dit in als standaard account"
 
 # shell/e-shell-view-menu.c:398

-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nieuw"
+#~ msgid "News"
+#~ msgstr "Nieuws"
+
+# addressbook/printing/e-contact-print.glade.h:10

+#~ msgid "Optional"
+#~ msgstr "Optioneel"
+
+# mail/mail-config.c:328

+#~ msgid "Organization:"
+#~ msgstr "Organisatie:"
+
+# mail/folder-browser-factory.c:101

+#~ msgid "Password:"
+#~ msgstr "Wachtwoord:"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Bezig met ontvangen E-mail"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Onthoud dit wachtwoord"
+
+# mail/folder-browser-factory.c:34

+#~ msgid "Reply-to:"
+#~ msgstr "Antwoord-naar:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565

+#~ msgid "Required"
+#~ msgstr "Benodigd"
+
+# addressbook/gui/component/addressbook.c:943

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

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

+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Signatuur bestand:"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

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

+#~ msgid "Server Configuration"
+#~ msgstr "Server Configuratie"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

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

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

+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Server:"
+
+# mail/mail-config.c:340

+#~ msgid "Signature file:"
+#~ msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:340

+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:1490

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

+#, fuzzy
+#~ msgid "Type"
+#~ msgstr "Type:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#, fuzzy
+#~ msgid "User Information"
+#~ msgstr "Geen informatie"
+
+# mail/mail-config.c:725

+#~ msgid "Username:"
+#~ msgstr "Gebruikersnaam:"
+
+#, fuzzy
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Welkom bij de Evolution Post Configuratie Wizard!\n"
+
+# calendar/gui/getdate.y:426

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

+#~ 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 ""
+#~ "Geef de naam en e-mail adres op voor uitgaande mail. Je kan ook de naam van "
+#~ "het het bedrijf oppgeven, en de naam van het bestand waar je signature in "
+#~ "staat."
+
+# mail/mail-config.c:277

+#~ msgid "Full name:"
+#~ msgstr "Volledige naam:"
+
+# mail/mail-config.c:305

+#~ msgid "Email address:"
+#~ msgstr "E-mail adres:"
+
+# mail/mail-config.c:345

+#~ msgid "Signature File"
+#~ msgstr "Signatuur Bestand"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#~ msgid "Server:"
+#~ msgstr "Server:"
+
+# mail/mail-config.c:751 mail/mail-config.c:831

+#~ msgid "Detect supported types..."
+#~ msgstr "Detecteer ondersteunde types..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Verwijder de berichten niet van de server"
+
+#~ msgid "Test Settings"
+#~ msgstr "Test Instellingen"
+
+# mail/mail-config.c:1220

+#~ msgid "Mail source type:"
+#~ msgstr "Post bron type:"
+
+# mail/mail-config.c:960

+#~ 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 ""
+#~ "Selecteer het soort postserver, en de overige benodigde infomatie.\n"
+#~ "\n"
+#~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
+#~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
+
+# addressbook/contact-editor/e-contact-editor-strings.h:10

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

+#~ msgid "News source type:"
+#~ msgstr "Nieuws bron type:"
+
+# mail/mail-config.c:960

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

+#~ msgid "Mail transport type:"
+#~ msgstr "Mail transport type:"
+
+# mail/mail-config.c:960

+#, fuzzy
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Selecteer het soort postserver, en de overige benodigde infomatie.\n"
+#~ "\n"
+#~ "Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
+#~ "types...\" klikken nadat je de overige informatie hebt ingevuld."
+
+# mail/mail-config.c:1345

+#~ msgid "Add Identity"
+#~ msgstr "Identiteit Toevoegen"
+
+# mail/mail-config.c:1343

+#~ msgid "Edit Identity"
+#~ msgstr "Identiteit Bewerken"
+
+# mail/mail-config.c:1490

+#~ msgid "Add Source"
+#~ msgstr "Bron Toevoegen"
+
+# mail/mail-config.c:1488

+#~ msgid "Edit Source"
+#~ msgstr "Bron Bewerken"
+
+# mail/mail-config.c:1658

+#~ msgid "Add News Server"
+#~ msgstr "Nieuwe Nieuws Server Toevoegen"
+
+# mail/mail-config.c:1656

+#~ msgid "Edit News Server"
+#~ msgstr "Bewerk Nieuws Server"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Bezig met Testen \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "De verbinding was successvol!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Bezig met uitzoeken van aanmeldings mogelijkheden van \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
+
+# composer/e-msg-composer-address-dialog.glade.h:11

+#~ msgid "Address"
+#~ msgstr "Adres"
+
+# mail/mail-config.c:1180

+#~ msgid "Identities"
+#~ msgstr "Identiteiten"
+
+# mail/mail-config.c:1199

+#~ msgid "Mail Sources"
+#~ msgstr "Post Bronnen"
+
+# mail/mail-config.c:1220

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

+#~ msgid "News Servers"
+#~ msgstr "Nieuws Servers"
+
+# mail/mail-config.c:1490

+#~ msgid "News Sources"
+#~ msgstr "Nieuws Bronnen"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Stuur berichten in HTML formaat"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr ""
+#~ "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
+
+# shell/e-shell-view-menu.c:404

+#~ msgid "Create a new contact"
+#~ msgstr "Nieuw contact maken"
+
+# addressbook/gui/component/addressbook.c:426

+#~ msgid "Delete a contact"
+#~ msgstr "Selecteer een contact"
+
+# addressbook/gui/component/addressbook.c:424

+#~ msgid "Find"
+#~ msgstr "Vinden"
+
+# addressbook/gui/component/addressbook.c:424

+#~ msgid "Find a contact"
+#~ msgstr "Zoek een contact"
 
 # addressbook/gui/component/addressbook.c:425

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

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

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

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

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

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

-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Gereedschap"
+#~ msgid "_Search for contacts"
+#~ msgstr "_Zoek naar kontakten"
 
 # calendar/gui/calendar-commands.c:525

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 Dagen"
+#~ msgid "5 Days"
+#~ msgstr "5 Dagen"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr "Volgende"
+#~ msgid "Next"
+#~ msgstr "Volgende"
 
 # calendar/gui/calendar-commands.c:664

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

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

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

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

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

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

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

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

-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Vandaag"
+#~ msgid "Show the working week"
+#~ msgstr "Laat de werkweek zien"
 
 # calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

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

-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nieuw"
+#~ msgid "_New"
+#~ msgstr "_Nieuw"
 
 # calendar/gui/calendar-commands.c:663

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

-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Druk deze kalender af"
+#~ msgid "_Print this calendar"
+#~ msgstr "_Druk deze kalender af"
 
 # composer/e-msg-composer.c:463

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

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

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

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

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

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

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

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

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

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

-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Item afdrukken"
+#~ msgid "Print this item"
+#~ msgstr "Item afdrukken"
 
 # addressbook/contact-editor/e-contact-editor.c:844

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

-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Afdrukken..."
+#~ msgid "Print..."
+#~ msgstr "Afdrukken..."
 
 # composer/e-msg-composer.c:463

-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Opslaan _Als..."
+#~ msgid "Save _As..."
+#~ msgstr "Opslaan _Als..."
 
 # addressbook/contact-editor/e-contact-editor.c:839

-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Opslaan en Sluiten"
+#~ msgid "Save and Close"
+#~ msgstr "Opslaan en Sluiten"
 
 # addressbook/contact-editor/e-contact-editor.c:840

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

-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "Stu_ur contact naar ander..."
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Stu_ur contact naar ander..."
 
 # addressbook/contact-editor/e-contact-editor.c:863

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

-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Zie help"
+#~ msgid "See online help"
+#~ msgstr "Zie help"
 
 # addressbook/contact-editor/e-contact-editor.c:782

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

-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Bestand"
+#~ msgid "_File"
+#~ msgstr "_Bestand"
 
 # addressbook/contact-editor/e-contact-editor.c:844

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

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

-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Opslaan"
+#~ msgid "_Save"
+#~ msgstr "_Opslaan"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "Over deze applicatie"
+#~ msgid "About this application"
+#~ msgstr "Over deze applicatie"
 
 # 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

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

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

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

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

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

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

-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "KopiКren"
+#~ msgid "Copy"
+#~ msgstr "KopiКren"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "KopiКer de selectie"
+#~ msgid "Copy the selection"
+#~ msgstr "KopiКer de selectie"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Knippen"
+#~ msgid "Cut"
+#~ msgstr "Knippen"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Knip de selectie"
+#~ msgid "Cut the selection"
+#~ msgstr "Knip de selectie"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "XML Dumpen"
+#~ msgid "Dump XML"
+#~ msgstr "XML Dumpen"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Dump de UI Xml omschrijving"
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump de UI Xml omschrijving"
 
 # calendar/gui/event-editor.c:1251

-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Adres _Boek..."
-
-# addressbook/contact-editor/e-contact-editor.c:653

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

-# calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Seleecteer F_ormulier"
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Adres _Boek..."
 
 # calendar/gui/event-editor.c:1250

-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Controleer Namen"
-
-# addressbook/contact-editor/e-contact-editor.c:675

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

-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopieer naar Folder..."
-
-# addressbook/contact-editor/e-contact-editor.c:761

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

-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Ontw_erp een Formulier..."
-
-# addressbook/contact-editor/e-contact-editor.c:660

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

-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: DefiniКer Print _Stijlen..."
-
-# addressbook/contact-editor/e-contact-editor.c:760

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

-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Ontwerp dit Formulier"
-
-# addressbook/contact-editor/e-contact-editor.c:715

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

-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Ee_rste Item in Folder"
-
-# addressbook/contact-editor/e-contact-editor.c:793

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

-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: Doorsturen"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Controleer Namen"
 
 # calendar/gui/event-editor.c:1265

-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Doorsturen als v_Calendar"
+#~ msgid "FIXME: Forward as v_Calendar"
+#~ msgstr "FIXME: Doorsturen als v_Calendar"
 
 # addressbook/contact-editor/e-contact-editor.c:862

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

-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Help"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Help"
 
 # addressbook/contact-editor/e-contact-editor.c:648

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

-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Niet complete taak"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Niet complete taak"
 
 # addressbook/contact-editor/e-contact-editor.c:848

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

-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Bestand Bijvoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:746

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

-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
-
-# addressbook/contact-editor/e-contact-editor.c:699

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

-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Plakken _Speciaal..."
-
-# addressbook/contact-editor/e-contact-editor.c:678

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

-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Afdruk_voorbeeld"
-
-# addressbook/contact-editor/e-contact-editor.c:764

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

-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_bliceer een Formulier als..."
-
-# addressbook/contact-editor/e-contact-editor.c:763

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

-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publiceer een _Formulier..."
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Bestand Bijvoegen"
 
 # calendar/gui/event-editor.c:1260

-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Herhaling..."
-
-# addressbook/contact-editor/e-contact-editor.c:667

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

-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: V_ersturen"
-
-# calendar/gui/event-editor.c:1333

-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Aanhangels Opslaan..."
-
-# addressbook/contact-editor/e-contact-editor.c:766

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

-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Script _Debugger"
-
-# addressbook/contact-editor/e-contact-editor.c:649

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

-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Taak Verzoek"
-
-# addressbook/contact-editor/e-contact-editor.c:647

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

-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:732

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

-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Aanpassen..."
-
-# addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: Bestand..."
-
-# addressbook/contact-editor/e-contact-editor.c:752

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

-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Font..."
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _Herhaling..."
 
 # addressbook/contact-editor/e-contact-editor.c:729

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

-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Opmaak"
-
-# addressbook/contact-editor/e-contact-editor.c:713

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

-# calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
-
-# addressbook/contact-editor/e-contact-editor.c:650

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

-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Dagboek Item"
-
-# addressbook/contact-editor/e-contact-editor.c:722

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

-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Laatste Item in Folder"
-
-# addressbook/contact-editor/e-contact-editor.c:646

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

-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mail bericht"
-
-# addressbook/contact-editor/e-contact-editor.c:658

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

-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo Stijl"
-
-# addressbook/contact-editor/e-contact-editor.c:674

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

-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Verplaats naar Folder..."
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "FIXME: _Opmaak"
 
 # calendar/gui/event-editor.c:1258

-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nieuwe Afspraak"
-
-# addressbook/contact-editor/e-contact-editor.c:651

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

-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: Aanteke_ning"
-
-# addressbook/contact-editor/e-contact-editor.c:747

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

-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Object..."
-
-# addressbook/contact-editor/e-contact-editor.c:753

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

-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Paragraaf..."
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Nieuwe Afspraak"
 
-# addressbook/contact-editor/e-contact-editor.c:771

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

-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Spelling..."
-
-# addressbook/contact-editor/e-contact-editor.c:727

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

-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standaard"
-
-# addressbook/contact-editor/e-contact-editor.c:648

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

-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Taak"
-
-# addressbook/contact-editor/e-contact-editor.c:714

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

-# calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Ongelezen Item"
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "FIXME: what moet hier staan?"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr "FIXME: what moet hier staan?"
+#~ msgid "Find Again"
+#~ msgstr "Opnieuw Zoeken"
 
-# addressbook/contact-editor/e-contact-editor.c:806

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

-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "_Opmaak"
-
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Opnieuw Zoeken"
-
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Opnieuw _Vinden"
-
-# addressbook/contact-editor/e-contact-editor.c:860

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

-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Ga naar het volgende item"
-
-# addressbook/contact-editor/e-contact-editor.c:857

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

-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Ga naar het vorige item"
+#~ msgid "Find _Again"
+#~ msgstr "Opnieuw _Vinden"
 
 # calendar/gui/prop.c:678

-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "De bestandseigenschappen wijzigen"
+#~ msgid "Modify the file's properties"
+#~ msgstr "De bestandseigenschappen wijzigen"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "V_olgende"
+#~ msgid "N_ext"
+#~ msgstr "V_olgende"
 
 # composer/e-msg-composer-address-dialog.c:191

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

-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Plakken"
+#~ msgid "Paste"
+#~ msgstr "Plakken"
 
 # composer/e-msg-composer-address-dialog.c:192

 # composer/e-msg-composer-address-dialog.c:200

-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Plak het klembord"
-
-# addressbook/contact-editor/e-contact-editor.c:737

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

-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Vorige"
+#~ msgid "Paste the clipboard"
+#~ msgstr "Plak het klembord"
 
 # addressbook/contact-editor/e-contact-editor.c:737

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

-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Vorige"
+#~ msgid "Previous"
+#~ msgstr "Vorige"
 
 # addressbook/contact-editor/e-contact-editor.c:844

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

-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Afdruk In_stellingen..."
+#~ msgid "Print S_etup..."
+#~ msgstr "Afdruk In_stellingen..."
 
 # addressbook/printing/e-contact-print.glade.h:7

-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Printer Instellingen"
+#~ msgid "Print Setup"
+#~ msgstr "Printer Instellingen"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Eigenschappen"
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Herhalen"
+#~ msgid "Redo"
+#~ msgstr "Herhalen"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
+#~ msgid "Redo the undone action"
+#~ msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
 # mail/folder-browser-factory.c:34

-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Vervangen"
+#~ msgid "Replace"
+#~ msgstr "Vervangen"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Tekenreeks vervangen"
+#~ msgid "Replace a string"
+#~ msgstr "Tekenreeks vervangen"
 
 # addressbook/contact-editor/e-contact-editor.c:840

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

-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Bewaar de afspraak en sluit dit venster"
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Bewaar de afspraak en sluit dit venster"
 
 # calendar/gui/calendar-commands.c:553

-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Huidig bestand opslaan"
+#~ msgid "Save the current file"
+#~ msgstr "Huidig bestand opslaan"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Afspraak Plannen"
+#~ msgid "Schedule Meeting"
+#~ msgstr "Afspraak Plannen"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "_Afspraak Plannen"
+#~ msgid "Schedule _Meeting"
+#~ msgstr "_Afspraak Plannen"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "Een soort afspraak maken"
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Een soort afspraak maken"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
+#~ msgid "Search again for the same string"
+#~ msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Zoek naar een tekenreeks"
+#~ msgid "Search for a string"
+#~ msgstr "Zoek naar een tekenreeks"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Alles Selecteren"
+#~ msgid "Select All"
+#~ msgstr "Alles Selecteren"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Selecteer alles"
+#~ msgid "Select everything"
+#~ msgstr "Selecteer alles"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Stel de pagina instellingen in voor de huidige printer"
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Stel de pagina instellingen in voor de huidige printer"
 
 # composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Ongedaan maken"
+#~ msgid "Undo"
+#~ msgstr "Ongedaan maken"
 
 # composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Maak de laatste bewerking ongedaan"
+#~ msgid "Undo the last action"
+#~ msgstr "Maak de laatste bewerking ongedaan"
 
 # shell/e-shell-view-menu.c:159

-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_Over..."
+#~ msgid "_About..."
+#~ msgstr "_Over..."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Sluiten"
+#~ msgid "_Close"
+#~ msgstr "_Sluiten"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_KopiКren"
+#~ msgid "_Copy"
+#~ msgstr "_KopiКren"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr "_Debug"
+#~ msgid "_Debug"
+#~ msgstr "_Debug"
 
 # calendar/gui/gncal-todo.c:488

-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "B_ewerken..."
+#~ msgid "_Edit"
+#~ msgstr "B_ewerken..."
 
 # addressbook/gui/component/addressbook.c:424

-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Vind..."
-
-# addressbook/contact-editor/e-contact-editor.c:773

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

-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Formulier"
+#~ msgid "_Find..."
+#~ msgstr "_Vind..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Help"
-
-# addressbook/contact-editor/e-contact-editor.c:805

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

-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:708

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

-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Object"
+#~ msgid "_Help"
+#~ msgstr "_Help"
 
 # composer/e-msg-composer-address-dialog.c:191

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

-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Plakken"
+#~ msgid "_Paste"
+#~ msgstr "_Plakken"
 
 # addressbook/gui/component/addressbook.c:425

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

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

-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Afdrukken"
+#~ msgid "_Print"
+#~ msgstr "_Afdrukken"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
+#~ msgid "_Properties..."
+#~ msgstr "_Eigenschappen..."
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "_Herhalen"
+#~ msgid "_Redo"
+#~ msgstr "_Herhalen"
 
 # composer/e-msg-composer.c:463

-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "Ve_rvangen..."
-
-# addressbook/contact-editor/e-contact-editor.c:740

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

-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_Werkbalk"
+#~ msgid "_Replace..."
+#~ msgstr "Ve_rvangen..."
 
 # composer/e-msg-composer.c:948

-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Ongedaan maken"
+#~ msgid "_Undo"
+#~ msgstr "_Ongedaan maken"
 
 # mail/folder-browser-factory.c:30

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Opstellen"
+#~ msgid "Compose"
+#~ msgstr "Opstellen"
 
 # mail/folder-browser-factory.c:30

-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Stel een nieuw bericht op"
+#~ msgid "Compose a new message"
+#~ msgstr "Stel een nieuw bericht op"
 
 # mail/folder-browser-factory.c:41

-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "KopiКer het bericht naar een nieuwe map"
+#~ msgid "Copy message to a new folder"
+#~ msgstr "KopiКer het bericht naar een nieuwe map"
 
 # shell/e-shell-view-menu.c:365

-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Map"
+#~ msgid "F_older"
+#~ msgstr "_Map"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Filteren op Afzender"
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filteren op Afzender"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filteren op Geadresseerden"
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filteren op Geadresseerden"
 
 # mail/folder-browser-factory.c:101

-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Wachtwoorden _Vergeten"
+#~ msgid "Forget _Passwords"
+#~ msgstr "Wachtwoorden _Vergeten"
 
 # mail/folder-browser-factory.c:29

-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Post Ophalen"
+#~ msgid "Get Mail"
+#~ msgstr "Post Ophalen"
 
 # mail/folder-browser-factory.c:45

-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Bericht Verwijderen"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Bericht Verwijderen"
 
 # mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Doorgestuurd bericht:\n"
+#~ msgid "Hide _Read messages"
+#~ msgstr "Doorgestuurd bericht:\n"
 
 # mail/folder-browser-factory.c:43

-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Druk dit bericht af"
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Druk dit bericht af"
 
 # addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "Post _Filters"
+#~ msgid "Mail _Filters..."
+#~ msgstr "Post _Filters"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Aanmeldingen Beheren"
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Aanmeldingen Beheren"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "_Markeer Als Gelezen"
+#~ msgid "Mar_k As Read"
+#~ msgstr "_Markeer Als Gelezen"
 
 # addressbook/contact-editor/e-contact-editor.c:704

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

-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markeer Als _Ongelezen"
 
 # calendar/gui/print.c:326

-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Verplaatsen"
+#~ msgid "Move"
+#~ msgstr "Verplaatsen"
 
 # mail/folder-browser-factory.c:41

-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Sla het bericht op in een bepaalde folder"
+#~ msgid "Move message to a new folder"
+#~ msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:894

-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Geeft een voorbeeld van het af te drukken bericht"
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Geeft een voorbeeld van het af te drukken bericht"
 
 # calendar/gui/print.c:1249

-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Afdrukvoorbeeld van bericht..."
+#~ msgid "Print Preview of message..."
+#~ msgstr "Afdrukvoorbeeld van bericht..."
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
+#~ msgid "Print message to the printer"
+#~ msgstr "Bericht afdrukken naar de printer"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Bericht afdrukken..."
+#~ msgid "Print message..."
+#~ msgstr "Bericht afdrukken..."
 
 # mail/folder-browser-factory.c:35

-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Iedereen Be_antwoorden"
+#~ msgid "Reply to _All"
+#~ msgstr "Iedereen Be_antwoorden"
 
 # mail/folder-browser-factory.c:35

-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Af_zender beantwoorden"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Af_zender beantwoorden"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "_Alles Selecteren"
+#~ msgid "Select _All"
+#~ msgstr "_Alles Selecteren"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Verzonden email-berichten"
+#~ msgid "Show _All messages"
+#~ msgstr "Verzonden email-berichten"
 
 # mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
+#~ msgid "Threaded Message list"
+#~ msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "VMap op Afze_nder"
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "VMap op _Geadresseerden"
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VMap op _Geadresseerden"
 
 # mail/mail-config.c:1490

-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr "Bekijk Pure Bericht Bron"
+#~ msgid "View Raw Message Source"
+#~ msgstr "Bekijk Pure Bericht Bron"
 
 # addressbook/contact-editor/e-contact-editor.c:745

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

-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "Filters _Toepassen"
-
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Configureer Map"
+#~ msgid "_Apply Filters"
+#~ msgstr "Filters _Toepassen"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "_KopiКren naar Map..."
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_KopiКren naar Map..."
 
 # composer/e-msg-composer.c:894

-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "Bericht _Bewerken"
+#~ msgid "_Edit Message"
+#~ msgstr "Bericht _Bewerken"
 
 # mail/folder-browser-factory.c:77

-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Legen"
+#~ msgid "_Expunge"
+#~ msgstr "_Legen"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "_Filteren op Onderwerp"
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filteren op Onderwerp"
 
 # mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Doorsturen"
+#~ msgid "_Forward"
+#~ msgstr "_Doorsturen"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "Selectie _Inverteren"
+#~ msgid "_Invert Selection"
+#~ msgstr "Selectie _Inverteren"
 
 # mail/folder-browser-factory.c:95

-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "_Mail Configuratie..."
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mail Configuratie..."
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_Bericht"
+#~ msgid "_Message"
+#~ msgstr "_Bericht"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "_Verplaatsen naar Map..."
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Openen in Nieuw Venster"
+#~ msgid "_Open in New Window"
+#~ msgstr "_Openen in Nieuw Venster"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "Bericht A_fdrukken"
+#~ msgid "_Print Message"
+#~ msgstr "Bericht A_fdrukken"
 
 # composer/e-msg-composer.c:463

-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "Bericht Op_slaan als..."
+#~ msgid "_Save Message As..."
+#~ msgstr "Bericht Op_slaan als..."
 
 # mail/mail-config.c:1490

-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Bron"
+#~ msgid "_Source"
+#~ msgstr "_Bron"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "Rela_ties weergeven"
+#~ msgid "_Threaded"
+#~ msgstr "Rela_ties weergeven"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:8

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

-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Herstellen"
+#~ msgid "_Undelete"
+#~ msgstr "_Herstellen"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "_VMap op Onderwerp"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VMap op Onderwerp"
 
 # mail/folder-browser-factory.c:89

-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtuele Map Bewerker"
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "_Virtuele Map Bewerker"
 
 # composer/e-msg-composer.c:951

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Bijvoegen"
+#~ msgid "Attach"
+#~ msgstr "Bijvoegen"
 
 # calendar/gui/calendar-commands.c:553

-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Huidig bestand sluiten"
+#~ msgid "Close the current file"
+#~ msgstr "Huidig bestand sluiten"
 
 # composer/e-msg-composer.c:894

-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Versleuteld bericht"
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Versleuteld bericht"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
 # composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Voeg een bestand bij het bericht"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Voeg een bestand bij het bericht"
 
 # composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Tekst bestand invoegen..."
+#~ msgid "Insert text file..."
+#~ msgstr "Tekst bestand invoegen..."
 
 # composer/e-msg-composer.c:561

-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Bestand openen"
-
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Open a file"
+#~ msgstr "Bestand openen"
 
 # composer/e-msg-composer.c:463

-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Opslaan Als"
+#~ msgid "Save As"
+#~ msgstr "Opslaan Als"
 
 # composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Opslaan in _map... (FIXME)"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Opslaan in _map... (FIXME)"
 
 # composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "Opslaan in _map..."
+#~ msgid "Save in folder..."
+#~ msgstr "Opslaan in _map..."
 
 # composer/e-msg-composer.c:888

-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "Sla het huidige bestand op onder een andere naam"
+#~ 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

-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Sla het bericht op in een bepaalde folder"
+#~ 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

-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Versturen"
+#~ msgid "Send"
+#~ msgstr "Versturen"
 
 # filter/filter-editor.c:198

-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "_Later Versturen"
+#~ msgid "Send _Later"
+#~ msgstr "_Later Versturen"
 
 # filter/filter-editor.c:198

-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "_Later versturen"
+#~ msgid "Send _later"
+#~ msgstr "_Later versturen"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "Stuur de mail in HTML formaat"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Stuur de mail in HTML formaat"
 
 # composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Dit bericht later versturen"
+#~ msgid "Send the message later"
+#~ msgstr "Dit bericht later versturen"
 
 # composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "Dit bericht nu versturen"
+#~ msgid "Send the message now"
+#~ msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:942

-#: ui/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "Dit bericht nu versturen"
+#~ msgid "Send this message now"
+#~ msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:907

-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "Toon / Verberg bijvoegsels"
+#~ msgid "Show / hide attachments"
+#~ msgstr "Toon / Verberg bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Bekijk _bijvoegsels"
+#~ msgid "Show _attachments"
+#~ msgstr "Bekijk _bijvoegsels"
 
-# composer/e-msg-composer.c:906

-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "Bekijk bijvoegsels"
-
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Bezig met versturen van een bericht zonder onderwerp"
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Bezig met versturen van een bericht zonder onderwerp"
 
 # composer/e-msg-composer.c:891

-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "Voeg test-bestand _in... (FIXME)"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Openen..."
+#~ msgid "_Open..."
+#~ msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "map toevoegen aan de lijst van aangemelde mappen"
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "map toevoegen aan de lijst van aangemelde mappen"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Lijst Verfrissen"
+#~ msgid "Refresh List"
+#~ msgstr "Lijst Verfrissen"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Lijst of Mappen Verfrissen"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Lijst of Mappen Verfrissen"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Map verwijderen van je lijst van aangemelde mappen"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Map verwijderen van je lijst van aangemelde mappen"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Aanmelden"
+#~ msgid "Subscribe"
+#~ msgstr "Aanmelden"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Afmelden"
+#~ msgid "Unsubscribe"
+#~ msgstr "Afmelden"
 
 # shell/e-shell-view-menu.c:402

-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Toon een andere map"
+#~ msgid "Display a different folder"
+#~ msgstr "Toon een andere map"
 
 # calendar/gui/gncal-todo.c:488

-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "Stop_pen"
+#~ msgid "E_xit"
+#~ msgstr "Stop_pen"
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution balk _snelkoppeling"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution balk _snelkoppeling"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Programma verlaten"
+#~ msgid "Exit the program"
+#~ msgstr "Programma verlaten"
 
 # shell/e-shell-view-menu.c:443

-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "_Beginnen"
+#~ msgid "Getting _Started"
+#~ msgstr "_Beginnen"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Geef informatie over Evolution weer"
+#~ msgid "Show information about Evolution"
+#~ msgstr "Geef informatie over Evolution weer"
 
 # shell/e-shell-view-menu.c:422

-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "_Mapbalk Tonen"
-
-# shell/e-shell-view-menu.c:419

-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Snelkoppelingenbalk Tonen"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "_Mapbalk Tonen"
 
 # shell/e-shell-view-menu.c:457

-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "_Bug Report Insturen"
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Bug Report Insturen"
 
 # shell/e-shell-view-menu.c:458

-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr "Bug Report insturen met Bug Buddy."
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Bug Report insturen met Bug Buddy."
 
 # shell/e-shell-view-menu.c:423

-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Toont de mapbalk"
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Toont de mapbalk"
 
 # shell/e-shell-view-menu.c:420

-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Toont de snelkoppelingenbalk"
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Toont de snelkoppelingenbalk"
 
 # shell/e-shell-view-menu.c:452

-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "Gebruik van de Kont_akt Beheerder"
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Gebruik van de Kont_akt Beheerder"
 
 # shell/e-shell-view-menu.c:449

-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Gebruik van de _Kalender"
+#~ msgid "Using the _Calendar"
+#~ msgstr "Gebruik van de _Kalender"
 
 # shell/e-shell-view-menu.c:446

-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "De _Mailer Gebruiken"
+#~ msgid "Using the _Mailer"
+#~ msgstr "De _Mailer Gebruiken"
 
 # shell/e-shell-view-menu.c:159

-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Over Evolution..."
+#~ msgid "_About Evolution..."
+#~ msgstr "_Over Evolution..."
 
 # shell/e-shell-view-menu.c:378

-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Afspraak (FIXME)"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Afspraak (FIXME)"
 
 # shell/e-shell-view-menu.c:381

-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (FIXME)"
 
 # shell/e-shell-view-menu.c:365

-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Map"
+#~ msgid "_Folder"
+#~ msgstr "_Map"
 
 # shell/e-shell-view-menu.c:402

-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Ga naar Map..."
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Ga naar Map..."
 
 # shell/e-shell-view-menu.c:440

-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Index"
+#~ msgid "_Index"
+#~ msgstr "_Index"
 
 # shell/e-shell-view-menu.c:375

-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "_Bericht mailen (FIXME)"
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_Bericht mailen (FIXME)"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "In_stellingen:"
+#~ msgid "_Settings"
+#~ msgstr "In_stellingen:"
 
 # shell/e-shell-view-menu.c:384

-#: ui/evolution.xml.h:33
-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:2471
-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"
-msgstr "Experimenteel"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:387

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Bezig"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:388

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Uit het Kantoor"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Geen informatie"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:405

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Nod_ig anderen uit..."
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:425

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opties"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:442

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "T_oon alleen werkuren"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:455

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Toon Uitge_zoomd"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Update Vrij/Druk"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:491

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Automatisch uitzoeken"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:522

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:539

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mensen en bronnen"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:552

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mensen en een bron"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Benodigde Mensen"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:578

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Vereiste mensen en een br_on"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Begintijd _vergadering:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:625

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "_Eindtijd vergadering:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle Gasten"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MDWDVZZ"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
-
-# widgets/misc/e-clipped-label.c:106

-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-# addressbook/gui/component/addressbook.c:420

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

-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nu"
-
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-# widgets/shortcut-bar/e-group-bar.c:632

-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Group %i"
-
-# addressbook/contact-editor/categories-strings.h:7

-#~ msgid "categories"
-#~ msgstr "CategorieКn"
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Taak (FIXME)"
 
 # addressbook/contact-editor/categories-strings.h:8

 #~ msgid "Item(s) belong to these categories:"
@@ -8597,16 +8397,6 @@ msgstr "Group %i"
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan bericht niet vergaren: %s"
 
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "UNIX mbox-formaat post bestanden"
-
-#~ 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."
-
 #~ 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"
@@ -8633,9 +8423,6 @@ msgstr "Group %i"
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan bericht niet toevoegen aan mh map: %s"
 
-#~ msgid "UNIX MH-format mail directories"
-#~ msgstr "UNIX MH-formaat post directories"
-
 #~ msgid "Could not rename folder `%s': %s"
 #~ msgstr "Kon de naam van map `%s' niet wijzigen: %s"
 
@@ -8648,9 +8435,6 @@ msgstr "Group %i"
 #~ msgid "Local mail directory %s"
 #~ msgstr "Directory voor lokale post %s"
 
-#~ msgid "Flagged"
-#~ msgstr "Gevlagd"
-
 # mail/component-factory.c:196

 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
@@ -8774,10 +8558,6 @@ msgstr "Group %i"
 #~ msgstr "_Openen"
 
 # shell/e-shell-view-menu.c:404

-#~ msgid "Create a new folder"
-#~ msgstr "Nieuwe map aanmaken"
-
-# shell/e-shell-view-menu.c:404

 #~ msgid "_Create New Folder..."
 #~ msgstr "Nieu_we map aanmaken..."
 
@@ -8884,10 +8664,6 @@ msgstr "Group %i"
 #~ msgid "Preferences"
 #~ msgstr "Instellingen"
 
-# calendar/gui/prop.c:780

-#~ msgid "Alarms"
-#~ msgstr "Alarmen"
-
 # calendar/gui/prop.c:783

 #~ msgid "Alarm Properties"
 #~ msgstr "Alarm Eigenschappen"
@@ -9013,31 +8789,6 @@ msgstr "Group %i"
 #~ msgid "Error while communicating with address server"
 #~ msgstr "Fout bij communiceren met adres server"
 
-# addressbook/contact-editor/e-contact-editor.c:643

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

-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Afspraak"
-
-# addressbook/contact-editor/e-contact-editor.c:644

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

-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "FIXME: Verzoek tot Vergadering"
-
-# addressbook/contact-editor/e-contact-editor.c:677

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

-#~ msgid "Page Set_up"
-#~ msgstr "Pagina instellingen"
-
-# addressbook/contact-editor/e-contact-editor.c:729

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

-#~ msgid "FIXME: __Formatting"
-#~ msgstr "FIXME: Opmaak"
-
-# addressbook/contact-editor/e-contact-editor.c:738

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

-#~ msgid "Ne_xt"
-#~ msgstr "Volgende"
-
 # addressbook/contact-editor/e-contact-editor.c:648

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

 #~ msgid "FIXME: _New Task"
@@ -9093,16 +8844,6 @@ msgstr "Group %i"
 #~ msgid "Delete this task"
 #~ msgstr "Verwijder deze taak"
 
-# addressbook/contact-editor/e-contact-editor.c:856

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

-#~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Vorige"
-
-# addressbook/contact-editor/e-contact-editor.c:859

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

-#~ msgid "FIXME: Next"
-#~ msgstr "FIXME: Volgende"
-
 # calendar/gui/event-editor.c:1215

 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ka_lender..."
@@ -9264,64 +9005,10 @@ msgstr "Group %i"
 #~ msgid "Run filter \"%s\""
 #~ msgstr "Start filter \"%s\""
 
-# addressbook/contact-editor/e-contact-editor.c:778

-#~ msgid "FIXME: _New Contact"
-#~ msgstr "FIXME: _Nieuw Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:779

-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "FIXME: Nieuw _Contact van Zelfde Bedrijf"
-
-# addressbook/contact-editor/e-contact-editor.c:781

-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "FIXME: Nieuwe Brief naar Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:783

-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "FIXME: Nieuwe Afspraak met Contact"
-
-# addressbook/contact-editor/e-contact-editor.c:784

-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "FIXME: Een Afspraak _Plannen..."
-
-# addressbook/contact-editor/e-contact-editor.c:785

-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "FIXME: Nieuwe _Taak for contact"
-
-# addressbook/contact-editor/e-contact-editor.c:786

-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "FIXME: Nieuwe Dagboek "
-
-# addressbook/contact-editor/e-contact-editor.c:788

-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Vlag voor Vervolg..."
-
-# addressbook/contact-editor/e-contact-editor.c:789

-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: Toon Folder met Adressen"
-
-# addressbook/contact-editor/e-contact-editor.c:790

-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: Pagina Bekijken"
-
-# addressbook/contact-editor/e-contact-editor.c:792

-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "FIXME: Doorsturen als _vCard"
-
 # addressbook/gui/component/addressbook.c:1010

 #~ msgid "* Click here to add a contact *"
 #~ msgstr "* Klik hier om een contact toe te voegen *"
 
-#~ msgid "Reflow Test"
-#~ msgstr "Reflow Test"
-
-# shell/e-shell-view-menu.c:161

-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#~ msgid "This should test the reflow canvas item"
-#~ msgstr "Dit zou het 'reflow' canvas item moeten testen"
-
 #~ msgid "Could not read pilot's DateBook application block"
 #~ msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
 
@@ -9404,26 +9091,10 @@ msgstr "Group %i"
 #~ msgid "Resources:"
 #~ msgstr "Bronnen:"
 
-# calendar/gui/goto.c:264

-#~ msgid "Completion date"
-#~ msgstr "Afmaak datum"
-
-#~ msgid "End date"
-#~ msgstr "Eind Datum"
-
 # mail/message-list.c:502

 #~ msgid "Due date"
 #~ msgstr "Verloop Datum"
 
-#~ msgid "Geographical position"
-#~ msgstr "Geografische positie"
-
-#~ msgid "Percent complete"
-#~ msgstr "Percentage af"
-
-#~ msgid "Transparency"
-#~ msgstr "Transparantheid"
-
 # addressbook/contact-editor/e-contact-editor.c:671

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

 #~ msgid "FIXME: Invite _Attendees..."
@@ -9518,26 +9189,6 @@ msgstr "Group %i"
 #~ msgid "Load Draftbox"
 #~ msgstr "Laden Kladvak"
 
-# mail/message-list.c:488

-#~ msgid "From"
-#~ msgstr "Van"
-
-# mail/message-list.c:516

-#~ msgid "To"
-#~ msgstr "Aan"
-
-# mail/message-list.c:523

-#~ msgid "Size"
-#~ msgstr "Grootte"
-
-# mail/component-factory.c:196

-#~ msgid "Cannot initialize Evolution's notes component."
-#~ msgstr "Kan het notitie gedeelte van Evolution niet initialiseren."
-
-# mail/main.c:62

-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
-
 #~ msgid "The component now claims that it doesn't support PersistStream!"
 #~ msgstr "Het component claimt nu dat het geen PersistStream ondersteund!"
 
diff --git a/po/nn.po b/po/nn.po
index df47638b0f..018702a5db 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,209 +14,386 @@ msgstr ""
 "Content-Type: text/plain; charset=utf8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Opphavsrett (c), %1 1997-2000"
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Vidaresendt melding"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Hentar data frц╔ %1"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Lukk"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Flytt til mappe"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Gц╔ til neste som treng ettersyn"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ikkje vis den overskytande teksten"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Ingen feil."
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Sambandet er brote."
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "New"
+msgstr "Ny ..."
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Lagar eit nytt dokument"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 #, fuzzy
 msgid ""
 "\n"
@@ -233,30 +410,19 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 #, 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikkje initiere Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -379,43 +545,34 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr "Feil under opning av dette dokumentet"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-#, fuzzy
-msgid "Delete Contact?"
-msgstr "Slett kolonne"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -426,7 +583,7 @@ msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
@@ -442,14 +599,7 @@ msgstr "Kjende typar"
 msgid "New phone type"
 msgstr "&Ny type"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Legg til"
 
@@ -519,7 +669,6 @@ msgid "C_ontacts..."
 msgstr "&Innhald ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -540,8 +689,6 @@ msgid "_Address..."
 msgstr "Adresse"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Generelt"
 
@@ -596,26 +743,29 @@ msgid "No_tes:"
 msgstr "Notat:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljar"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn pц╔ assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Firma-fax"
 
@@ -624,6 +774,7 @@ msgid "Callback"
 msgstr "Ring tilbake"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
@@ -634,30 +785,35 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Heim"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Heime-faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Anna"
 
@@ -666,10 +822,12 @@ msgid "Other Fax"
 msgstr "Alternativ faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Personsц╦kjar"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
@@ -689,72 +847,18 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-#, fuzzy
-msgid "Address _2:"
-msgstr "Adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#, fuzzy
-msgid "Check Address"
-msgstr "Alternativ adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-#, fuzzy
-msgid "Countr_y:"
-msgstr "Land:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#, fuzzy
-msgid "_Address:"
-msgstr "Adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-#, fuzzy
-msgid "_City:"
-msgstr "Stad:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-#, fuzzy
-msgid "_PO Box:"
-msgstr "Postboks"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-#, fuzzy
-msgid "_State/Province:"
-msgstr "Stat/provins"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-#, fuzzy
-msgid "_ZIP Code:"
-msgstr "ZIP/Postnummer"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -815,12 +919,7 @@ msgstr "Etterstaving"
 msgid "As _Minicards"
 msgstr "Bruk jokerteikn"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
 msgid "As _Table"
 msgstr "Tabell"
@@ -847,29 +946,29 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "Smц╔ ikon"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -898,9 +997,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr ""
 
@@ -936,12 +1035,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "time/timar"
@@ -962,12 +1059,10 @@ msgid "Search Scope:"
 msgstr "Sц╦k"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sti:"
 
@@ -993,213 +1088,92 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Navn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Kjelde:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Slett"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Rediger"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Namn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-#, fuzzy
-msgid "URI"
-msgstr "URL"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Finn ..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
-msgid "Message Recipients"
-msgstr "Melding motteken"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "Select Names"
-msgstr "Merk omrц╔de"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Vel ei gruppe fц╦rst."
-
 #: 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-#, fuzzy
-msgid "a"
-msgstr "am"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
 #, fuzzy
-msgid "b"
-msgstr "av"
+msgid "Save as VCard"
+msgstr "Lagra som"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
-#, fuzzy
-msgid "c"
-msgstr "cm"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Namn"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "d"
-msgstr "Id"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
+msgid "Email"
+msgstr "E-post 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: addressbook/gui/widgets/e-addressbook-view.c:570
 #, fuzzy
-msgid "g"
-msgstr "gs"
+msgid "Organization"
+msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "i"
-msgstr "er"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
+msgid "Department"
+msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 #, fuzzy
-msgid "k"
-msgstr "Ok"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
+msgid "Office"
+msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 #, fuzzy
-msgid "m"
-msgstr "ms"
+msgid "Title"
+msgstr "Tittel:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 #, fuzzy
-msgid "n"
-msgstr "Pц╔"
+msgid "Profession"
+msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 #, fuzzy
-msgid "o"
-msgstr "Nei"
+msgid "Manager"
+msgstr "Personsц╦kjar"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 #, fuzzy
-msgid "p"
-msgstr "pm"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
+msgid "Nickname"
+msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 #, fuzzy
-msgid "r"
-msgstr "Dr"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+msgid "Spouse"
+msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 #, fuzzy
-msgid "t"
-msgstr "Qt"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr ""
+msgid "Note"
+msgstr "Ingen"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-#, fuzzy
-msgid "x"
-msgstr "Tx"
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-#, fuzzy
-msgid "y"
-msgstr "av"
-
-#: addressbook/gui/widgets/alphabet.glade.h:32
-#, fuzzy
-msgid "z"
-msgstr "Hz"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-#, fuzzy
-msgid "Save as VCard"
-msgstr "Lagra som"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1208,196 +1182,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Kropp"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Botn:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-#, fuzzy
-msgid "Dimensions:"
-msgstr "Dimensjonar"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Skrifttype ..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Skrifttypar"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-#, fuzzy
-msgid "Footer:"
-msgstr "Botntekst"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Dekl."
-
-#: addressbook/printing/e-contact-print.glade.h:17
-#, fuzzy
-msgid "Header/Footer"
-msgstr "&Topp-/botntekst ..."
-
-#: addressbook/printing/e-contact-print.glade.h:18
-#, fuzzy
-msgid "Headings"
-msgstr "Les"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-#, fuzzy
-msgid "Headings for each letter"
-msgstr "Les mapper"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Hц╦gd:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-#, fuzzy
-msgid "Include:"
-msgstr "Inkluder fil"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Liggjande"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-#, fuzzy
-msgid "Margins"
-msgstr "&Marg"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-#, fuzzy
-msgid "Number of columns:"
-msgstr "Tal pц╔ kolonnar:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Val"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Retning"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-#, fuzzy
-msgid "Page Setup:"
-msgstr "Speloppsett"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-#, fuzzy
-msgid "Paper source:"
-msgstr "Papir&storleik:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Stц╔ande"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Fц╦rehandsvising:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-#, fuzzy
-msgid "Print using gray shading"
-msgstr "Skriv med grц╔nyansar"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-#, fuzzy
-msgid "Reverse on even pages"
-msgstr "Merk partal-sider"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Hц╦gre:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-#, fuzzy
-msgid "Sections:"
-msgstr "Del:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#, fuzzy
-msgid "Shading"
-msgstr "Lagring"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Storleik:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-#, fuzzy
-msgid "Start on a new page"
-msgstr "Startar nytt spel ..."
-
-#: addressbook/printing/e-contact-print.glade.h:43
-#, fuzzy
-msgid "Style name:"
-msgstr "Typenamn:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Topp:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Breidd:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-#, fuzzy
-msgid "label26"
-msgstr "Etikett"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1408,14 +1192,14 @@ msgstr "Tilgjengelege lenkjer:"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "ц≤ydelagd oppsettfil."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -1428,73 +1212,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Skriv ut alle"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Tilgjengelege lenkjer:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "ц≤ydelagd oppsettfil."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 #, fuzzy
 msgid "Snooze"
 msgstr "Spooler"
@@ -1505,27 +1233,27 @@ msgstr "Spooler"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Fann ikkje fil"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 #, fuzzy
 msgid "Open calendar"
 msgstr "Feil ved opning"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 #, fuzzy
 msgid "Save calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1533,66 +1261,63 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1601,7 +1326,7 @@ msgid ""
 msgstr "Ein bandindeks mц╔ vera valt i treet."
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1609,976 +1334,467 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 #, fuzzy
 msgid "%H:%M%n"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 #, fuzzy
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mц╔ vera i omrц╔det 1-99"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%H:%M"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "Vis"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Avtale"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Vedlegg"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 #, fuzzy
 msgid "No summary available."
 msgstr "Ingen bilete tilgjengeleg."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Lukk"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#, fuzzy
-msgid "Edit appointment"
-msgstr "&Endra avtale ..."
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-#, fuzzy
-msgid "Snooze time (minutes)"
-msgstr "Lц╔g grense (minutt):"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#, fuzzy
-msgid "05 minutes"
-msgstr "minutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "10 minutes"
-msgstr "minutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "15 minutes"
-msgstr "minutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "24 hour"
-msgstr "time/timar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "30 minutes"
-msgstr "minutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "60 minutes"
-msgstr "minutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Audio Alarms"
-msgstr "Alarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Calendar"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Calendar Preferences"
-msgstr "Innstillingar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Fargar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Standard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "Display options"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Forfallsdato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
-msgid "End of day:"
-msgstr "Slutt trekk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-#, fuzzy
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Highlight"
-msgstr "Opplysing:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#, fuzzy
-msgid "Items Due Today"
-msgstr "&Opplys syntaks"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mц╔n"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Mц╔ndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Overdue Items"
-msgstr "&Syntaksmerkingsmodusar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
-msgid "Remind me of all appointments"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#, fuzzy
-msgid "Reminders"
-msgstr "Pц╔minning:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lau"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-#, fuzzy
-msgid "Saturday"
-msgstr "Laurdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "Show appointment end times"
-msgstr "Avtale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#, fuzzy
-msgid "Show week numbers"
-msgstr "Vis %1"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#, fuzzy
-msgid "Start of day:"
-msgstr "Start-dato"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Sundag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#, fuzzy
-msgid "TaskPad"
-msgstr "Oppgц╔ve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-#, fuzzy
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#, fuzzy
-msgid "Time Until Due"
-msgstr "Tid og dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#, fuzzy
-msgid "Time divisions:"
-msgstr "Dimensjonar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#, fuzzy
-msgid "Time format:"
-msgstr "Tidsformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tys"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-#, fuzzy
-msgid "Tuesday"
-msgstr "Tysdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#, fuzzy
-msgid "Visual Alarms"
-msgstr "Alarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-#, fuzzy
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#, fuzzy
-msgid "Work week"
-msgstr "Veke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#, fuzzy
-msgid "seconds."
-msgstr "sekund"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#, fuzzy
-msgid "% Comp_lete:"
-msgstr "Ferdig"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
+msgstr "Rediger oppgц╔ve"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 #, fuzzy
-msgid "C_lassification:"
-msgstr "&Forstц╦rring"
+msgid "No summary"
+msgstr "oppsummering"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#, fuzzy
-msgid "Cancelled"
-msgstr "Avbroten."
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Ferdig"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "Oppgц╔ver"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#, fuzzy
-msgid "Date Completed:"
-msgstr "Ferdig"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 #, fuzzy
-msgid "High"
-msgstr "Hц╦gd"
+msgid "Do you want to save changes?"
+msgstr "I ferd med ц╔ senda e-post ..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/e-calendar-table.c:154
 #, fuzzy
-msgid "In Progress"
-msgstr "Framgong:"
+msgid "Categories"
+msgstr "Kategoriar"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/e-calendar-table.c:155
 #, fuzzy
-msgid "Low"
-msgstr "Senk"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Normal"
+msgid "Classification"
+msgstr "&Forstц╦rring"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
-msgid "Not Started"
-msgstr "Starta"
+msgid "Completion Date"
+msgstr "Fullfц╦ring"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
-msgid "S_ummary"
-msgstr "Samandrag"
+msgid "End Date"
+msgstr "Slutt-dato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
-msgid "Sta_rt Date:"
+msgid "Start Date"
 msgstr "Start-dato:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Oppgц╔ve"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Contacts..."
-msgstr "&Innhald ..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#, fuzzy
-msgid "_Due Date:"
-msgstr "Forfallsdato:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Forfallsdato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
-msgid "_Priority:"
-msgstr "Prioritet:"
+msgid "Geographical Position"
+msgstr "Etikettplassering"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
-msgid "_Status:"
-msgstr "Status:"
+msgid "Precent complete"
+msgstr "Prosentformat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritet"
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr "Rediger oppgц╔ve"
+#: calendar/gui/e-calendar-table.c:163
+msgid "Summary"
+msgstr "Samandrag"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
-msgid "No summary"
-msgstr "oppsummering"
-
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Avtale"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "Oppgц╔ver"
+msgid "Transparency"
+msgstr "Gjennomsiktig "
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
-msgid "Do you want to save changes?"
-msgstr "I ferd med ц╔ senda e-post ..."
+msgid "Alarms"
+msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 #, fuzzy
 msgid "Open the task"
 msgstr "Opna med %1"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 #, fuzzy
 msgid "Mark Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 #, fuzzy
 msgid "Mark the task complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Slett"
+
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Delete the task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 #, fuzzy
 msgid "New appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 #, fuzzy
 msgid "Edit this appointment..."
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 #, fuzzy
 msgid "Make this appointment movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Erstatt denne fц╦rekomsten?"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 #, fuzzy
 msgid "Delete all occurrences"
 msgstr "Slettar klassen"
 
-#. 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 "%d %B"
-msgstr "%1 %2"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Appointment Basics"
-msgstr "Avtale"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-#, fuzzy
-msgid "Classification"
-msgstr "&Forstц╦rring"
+msgid "Category:"
+msgstr "Kategoriar"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "Repetering"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-#, fuzzy
-msgid "Days"
-msgstr "Dag"
+#: calendar/gui/e-tasks.c:297
+#, fuzzy, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden %1 er ikkje stц╦tta."
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#. 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:338
 #, fuzzy
-msgid "Every"
-msgstr "kvar"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "Unntak"
+msgid "%d %B"
+msgstr "%1 %2"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor.c:331
 #, fuzzy
-msgid "Hours"
-msgstr "time/timar"
+msgid "Edit Appointment"
+msgstr "&Endra avtale ..."
 
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor.c:409
 #, fuzzy
-msgid "Mail _to:"
-msgstr "E-post:"
+msgid "on"
+msgstr "Mц╔n"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Minutes"
-msgstr "minutt"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dagen"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#, fuzzy
-msgid "Modify"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
 msgstr "Mц╔ndag"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#, fuzzy
-msgid "No recurrence"
-msgstr "Repetering"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Preview"
-msgstr "Fц╦rehandsvising:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#, fuzzy
-msgid "Pri_vate"
-msgstr "Privat"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#, fuzzy
-msgid "Pu_blic"
-msgstr "Praksis"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "Repetering"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#, fuzzy
-msgid "Recurrence Rule"
-msgstr "Regel for repetering"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-#, fuzzy
-msgid "Reminder"
-msgstr "Pц╔minning:"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-#, fuzzy
-msgid "Simple recurrence"
-msgstr "Repetering"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "Samandrag:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-#, fuzzy
-msgid "_Audio"
-msgstr "Lyd"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-#, fuzzy
-msgid "_Confidential"
-msgstr "Eksponentiell"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-#, fuzzy
-msgid "_Display"
-msgstr "Vis"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-#, fuzzy
-msgid "_End time:"
-msgstr "Slutt-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-#, fuzzy
-msgid "_Mail"
-msgstr "Send"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "_Program"
-msgstr "Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "_Run program:"
-msgstr "Terminalprogram:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-#, fuzzy
-msgid "_Start time:"
-msgstr "Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-#, fuzzy
-msgid "_Starting date:"
-msgstr "Start-dato"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dag(ar)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-#, fuzzy
-msgid "event-editor-dialog"
-msgstr "Opnar angrehistoriedialogen"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-#, fuzzy
-msgid "for"
-msgstr "Munnar"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-#, fuzzy
-msgid "forever"
-msgstr "Repeterer for alltid"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor.c:436
 #, fuzzy
-msgid "label21"
-msgstr "Etikett"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "mц╔nad(er)"
+msgid "Tuesday"
+msgstr "Tysdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor.c:437
 #, fuzzy
-msgid "until"
-msgstr "utan tittel"
+msgid "Wednesday"
+msgstr "Onsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor.c:438
 #, fuzzy
-msgid "week(s)"
-msgstr "veke(r) pц╔:"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "ц╔r"
+msgid "Thursday"
+msgstr "Torsdag"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:439
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "&Endra avtale ..."
+msgid "Friday"
+msgstr "Fredag"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:440
 #, fuzzy
-msgid "on"
-msgstr "Mц╔n"
+msgid "Saturday"
+msgstr "Laurdag"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dagen"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Sundag"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "Mц╔nad"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/gnome-cal.c:676
+#: calendar/gui/gnome-cal.c:696
 #, fuzzy, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/gnome-cal.c:687
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, fuzzy, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje stц╦tta."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "April"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "Desember"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "Februar"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Gц╔ til side"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Gц╔ til &i dag"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "Januar"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "Juli"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Sun"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "Juni"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Mц╔n"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "Mars"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tys"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Mц╔ndag"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tor"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "Oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Lau"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -2781,11 +1997,16 @@ msgstr "Gjeldande: %1"
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Fц╦rehandsvising ..."
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "Viser korleis datoverdiar vert viste."
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2884,61 +2105,69 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Avbroten."
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Feil ved opning"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2947,17 +2176,17 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2973,40 +2202,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -3018,25 +2248,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3044,7 +2274,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -3052,15 +2282,16 @@ msgstr ""
 "Feil: %1"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr ""
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "Separate katalogar"
 
 #: 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -3068,7 +2299,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3411,8 +2642,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3441,72 +2672,71 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -3555,131 +2785,125 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3724,13 +2948,12 @@ msgid "attachment"
 msgstr "Vedlegg"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Fjern"
 
@@ -3749,72 +2972,54 @@ msgstr "Vedlegg"
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-#, fuzzy
-msgid "Attachment properties"
-msgstr "Vedleggseigenskapar"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-#, fuzzy
-msgid "MIME type:"
-msgstr "MIME-type"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Frц╔:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn pц╔ meldinga."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 #, fuzzy
 msgid "Enter the subject of the mail"
 msgstr "Oppgi typen til medlemsvariabelen her."
@@ -3829,45 +3034,45 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 #, fuzzy
 msgid "Evolution"
 msgstr "Opplц╦ysing"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -3877,61 +3082,56 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 #, fuzzy
 msgid "That file does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 #, fuzzy
 msgid "That is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 #, fuzzy
 msgid "That file exists but is not readable."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 #, 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:971
+#: composer/e-msg-composer.c:982
 #, fuzzy
 msgid "An error occurred while reading the file."
 msgstr "Feil ved opning av fil."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, 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 "year"
@@ -4074,7 +3274,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Rediger fil"
@@ -4187,214 +3387,190 @@ msgstr ""
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid "Edit VFolders"
-msgstr "Rediger filterreglar"
-
-#: filter/filter.glade.h:11
-#, fuzzy
-msgid "Filter Rules"
-msgstr "Filter-reglar"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "Oversikt"
-
-#: filter/filter.glade.h:15
-#, fuzzy
-msgid "Virtual Folders"
-msgstr "Mapper"
-
-#: filter/filter.glade.h:16
-#, fuzzy
-msgid "vFolder Sources"
-msgstr "Kjelder"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "contains"
-msgstr "Handlingar"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Date received"
 msgstr "Motta"
 
-#: filter/libfilter-i18n.h:9
+#: 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
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr ""
+#, fuzzy
+msgid "Message was received"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:13
 #, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
+msgid "Message was sent"
+msgstr "Lag meldingar og slц╔ saman"
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:15
 #, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
+msgid "Recipients"
+msgstr "Nyleg brukte fargar"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "exists"
-msgstr "Neste"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Poengsum"
 
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Expression"
-msgstr "&Yrke:"
+msgid "Sender"
+msgstr "Send"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
+msgid "Set Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "is"
-msgstr "er"
+msgid "Source"
+msgstr "Kjelder"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Message Body"
-msgstr "Flytta alle meldingar til papirkorga"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "Message Header"
-msgstr "Melding motteken"
+msgid "after"
+msgstr "Slutt etter"
 
 #: filter/libfilter-i18n.h:26
-#, fuzzy
-msgid "Message was received"
-msgstr "Melding motteken"
+msgid "before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "Message was sent"
-msgstr "Lag meldingar og slц╔ saman"
+msgid "contains"
+msgstr "Handlingar"
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr ""
+#, 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 "Recipients"
-msgstr "Nyleg brukte fargar"
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
 #, fuzzy
-msgid "Sender"
-msgstr "Send"
+msgid "exists"
+msgstr "Neste"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "Status:"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Source"
-msgstr "Kjelder"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr ""
+#, fuzzy
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr ""
+#, fuzzy
+msgid "on or after"
+msgstr "Slutt etter"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "Status:"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Emne"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 #, fuzzy
@@ -4415,10 +3591,6 @@ msgstr "Legg til fil"
 msgid "Edit Score Rule"
 msgstr "Rediger filterreglar"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Poengsum"
-
 #: filter/vfolder-editor.c:155
 #, fuzzy
 msgid "Add VFolder Rule"
@@ -4429,233 +3601,183 @@ msgstr "Rediger filterreglar"
 msgid "Edit VFolder Rule"
 msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Lagra"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Vel mappe"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 #, fuzzy
 msgid "Subject contains"
 msgstr "Emne"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 #, fuzzy
 msgid "VFolder on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 #, fuzzy
 msgid "VFolder on Sender"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 #, fuzzy
 msgid "VFolder on Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 #, fuzzy
 msgid "Filter on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 #, fuzzy
 msgid "Filter on Recipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr ""
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Skjul"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Slett"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Emne"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Fil under:"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "Opna ..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Rediger"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Fram"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Lagra melding"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Emne"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Kunne ikkje starta %1."
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "Format"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "&Ny type"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "Standard"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "ms"
+msgid "Evolution Account Editor"
+msgstr "KDeelop-installering"
 
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
@@ -4677,7 +3799,7 @@ msgstr "Melding frц╔ %s"
 msgid "%s mailing list"
 msgstr "E-post&liste for sprц╔ket:"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4685,572 +3807,121 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 #, 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:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Informasjon"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Vedleggseigenskapar"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Legg til ..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "Autentisering:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "Autentisering:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Standard"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Slett e-post frц╔ tenaren"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Ingen"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "E-post-adresse:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "E-post-adresse:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Oppsett"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Fullt namn"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Brukarnamn:"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "Send"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "Smц╔ ikon"
-
-#: mail/mail-config-druid.glade.h:42
-#, fuzzy
-msgid "Mail Configuration"
-msgstr "Oppsett"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Oppsett"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Ny ..."
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Val"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Password:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Svar"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Svar"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Lagra som"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Send"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Oppsett"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Tenar:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Tenar:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-#, fuzzy
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Kjelder"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Type:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Informasjon"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukarnamn:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minutt"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-
-#: mail/mail-config-gui.c:446
-#, fuzzy
-msgid "Full name:"
-msgstr "Fullt namn"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-post-adresse:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Signature File"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Tenar:"
-
-#: mail/mail-config-gui.c:956
-#, fuzzy
-msgid "Detect supported types..."
-msgstr "Vel modemtype ..."
-
-#: 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:1003
-#, fuzzy
-msgid "Test Settings"
-msgstr "Skriftinnstillingar"
-
-#: mail/mail-config-gui.c:1130
-#, fuzzy
-msgid "Mail source type:"
-msgstr "E-post-&transport:"
-
-#: mail/mail-config-gui.c:1135
-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: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"
-"\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
-#, fuzzy
-msgid "Mail transport type:"
-msgstr "E-post-&transport:"
-
-#: mail/mail-config-gui.c:1183
+#: mail/mail-config-druid.c:363
+#, c-format
 msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:1233
-#, fuzzy
-msgid "Add Identity"
-msgstr " Identitet"
-
-#: mail/mail-config-gui.c:1235
-#, fuzzy
-msgid "Edit Identity"
-msgstr " Identitet"
-
-#: mail/mail-config-gui.c:1333
-#, fuzzy
-msgid "Add Source"
-msgstr "Kjelde:"
-
-#: mail/mail-config-gui.c:1335
-#, fuzzy
-msgid "Edit Source"
-msgstr "Endra teneste"
-
-#: mail/mail-config-gui.c:1430
-#, fuzzy
-msgid "Add News Server"
-msgstr "Legg til tenar"
-
-#: mail/mail-config-gui.c:1432
-#, fuzzy
-msgid "Edit News Server"
-msgstr "R&ediger tenarar"
-
-#: 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:2346
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Querying authorization capabilities of \"%s\""
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adresse"
-
-#: mail/mail-config.glade.h:10
-#, fuzzy
-msgid "Identities"
-msgstr "Identifikator"
-
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Mail Sources"
-msgstr "Kjelder"
-
-#: mail/mail-config.glade.h:12
-#, fuzzy
-msgid "Mail Transport"
-msgstr "&E-post-transport"
-
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "Lag meldingar og slц╔ saman"
-
-#: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "News Servers"
-msgstr "Diskusjonsgruppetenarar"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "News Sources"
-msgstr "Kjelder"
-
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Organization"
-msgstr "Organisasjon:"
-
-#: mail/mail-config.glade.h:18
-#, fuzzy
-msgid "Send messages in HTML format"
-msgstr "Send meldingar:"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-#, fuzzy
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-#, fuzzy
-msgid "No password provided."
-msgstr "Ingen passord oppgitt."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, fuzzy, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-#, fuzzy
-msgid "No GPG/PGP program available."
-msgstr "Ingen bilete tilgjengeleg."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
 #: mail/mail-display.c:98
 #, fuzzy, c-format
 msgid ""
@@ -5294,68 +3965,69 @@ msgstr "Opnar URL ..."
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Svar"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5413,7 +4085,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5443,167 +4115,167 @@ msgstr ""
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Hentar data frц╔ %1"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, fuzzy, c-format
 msgid "There is no new mail at %s."
 msgstr "Det er ikkje band i stasjonen."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 #, fuzzy
 msgid "Filtering email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 #, fuzzy
 msgid "Filter email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 #, fuzzy
 msgid "Sending queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 #, fuzzy
 msgid "Send queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, fuzzy, c-format
 msgid "Appending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 #, fuzzy
 msgid "Appending a message without a subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, fuzzy, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, fuzzy, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 #, fuzzy
 msgid "(No description)"
 msgstr "Inga skildring"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synkroniser"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, fuzzy, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Endra mappe"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5617,7 +4289,7 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbroten."
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 #, fuzzy
 msgid "Incomplete message written on pipe!"
 msgstr "<ferdig melding>"
@@ -5737,123 +4409,201 @@ msgstr "Ny mappe"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 #, fuzzy
 msgid "Forward this message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Sentrer dei valte elementa"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 #, fuzzy
 msgid "Delete this message"
 msgstr "Slett denne adressa"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ukjend"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "Vedlegg"
+
+#: mail/message-list.c:1110
+msgid "From"
+msgstr "Frц╔"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Forfallsdato"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Motta"
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Til"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Storleik"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Oppgi ditt OpenPGP-passord"
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+#, fuzzy
+msgid "No GPG/PGP program available."
+msgstr "Ingen bilete tilgjengeleg."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+#, fuzzy
+msgid "No password provided."
+msgstr "Ingen passord oppgitt."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, fuzzy, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Mapper"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Poengsum"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Lag ny mappe i %1"
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
@@ -5956,33 +4706,33 @@ msgstr ""
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 #, fuzzy
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: 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:334
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
@@ -5991,13 +4741,18 @@ msgstr "Flytt til mappe"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1098
 #, fuzzy, c-format
-msgid "Evolution - %s"
+msgid "%s - Evolution %s"
+msgstr "Evalueringsfeil"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
 #: shell/e-shell.c:372
@@ -6005,82 +4760,91 @@ msgstr "Evalueringsfeil"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, fuzzy, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 #, fuzzy
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 #, fuzzy
 msgid "_Small Icons"
 msgstr "Smц╔ ikon"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 #, fuzzy
 msgid "_Remove This Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppfц╦ringa"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "&Programsnц╦ggtastar"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktiver"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 #, fuzzy
 msgid "Activate this shortcut"
 msgstr "&Programsnц╦ggtastar"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -6089,13 +4853,12 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
@@ -6202,1429 +4965,1980 @@ msgstr "Deaktivert"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-contact-editor.xml:7
 #, fuzzy
-msgid "Create a new contact"
-msgstr "Lagar eit nytt dokument"
+msgid "FIXME: _Appointment"
+msgstr "Avtale"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-contact-editor.xml:8
 #, fuzzy
-msgid "Delete a contact"
-msgstr "Slett kolonne"
+msgid "FIXME: Meeting Re_quest"
+msgstr "&Fц╦rehandsvising ..."
+
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:22
+#, fuzzy
+msgid "FIXME: _Memo Style"
+msgstr "Elementstil"
+
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "Find"
-msgstr "Finn ..."
+msgid "FIXME: Define Print _Styles..."
+msgstr "&Fц╦rehandsvising ..."
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: ui/evolution-contact-editor.xml:35
 #, fuzzy
-msgid "New"
-msgstr "Ny ..."
+msgid "FIXME: Save Attac_hments..."
+msgstr "Smarte vedlegg"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
+#: ui/evolution-contact-editor.xml:38
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "Flytt til mappe"
+
+#: ui/evolution-contact-editor.xml:39
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Kopier til mappe"
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Speloppsett"
+
+#: ui/evolution-contact-editor.xml:42
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "&Fц╦rehandsvising ..."
+
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "Lim inn spesiell ..."
+
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Mar&ker som ulesen"
+
+#: ui/evolution-contact-editor.xml:72
+#, fuzzy
+msgid "_Object"
+msgstr "Objekt"
+
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-contact-editor.xml:91
 #, fuzzy
-msgid "Stop Loading"
-msgstr "Lagring"
+msgid "FIXME: _Standard"
+msgstr "Standard"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-contact-editor.xml:93
 #, fuzzy
-msgid "View All"
-msgstr "Vinkel"
+msgid "FIXME: __Formatting"
+msgstr "Tekstformatering"
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr ""
+#: ui/evolution-contact-editor.xml:96
+#, fuzzy
+msgid "FIXME: _Customize..."
+msgstr "Tilpass ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:101
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "Oppsett"
+msgid "Pre_vious"
+msgstr "Fц╦rre"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-contact-editor.xml:102
 #, fuzzy
-msgid "_Print Contacts..."
-msgstr "&Innhald ..."
+msgid "Ne_xt"
+msgstr "Neste"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
+#: ui/evolution-contact-editor.xml:104
+#, fuzzy
+msgid "_Toolbars"
+msgstr "Verktц╦ylinjer"
+
+#: ui/evolution-contact-editor.xml:109
+#, fuzzy
+msgid "FIXME: _File..."
+msgstr "Sett inn fil ..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
+#: ui/evolution-contact-editor.xml:111
 #, fuzzy
-msgid "_Tools"
-msgstr "Verktц╦y"
+msgid "FIXME: _Object..."
+msgstr "&Objekt ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-contact-editor.xml:116
 #, fuzzy
-msgid "5 Days"
-msgstr " dag"
+msgid "FIXME: _Font..."
+msgstr "Skrifttype ..."
+
+#: ui/evolution-contact-editor.xml:117
+#, fuzzy
+msgid "FIXME: _Paragraph..."
+msgstr "&Avsnitt ..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-contact-editor.xml:135
 #, fuzzy
-msgid "Alter preferences"
-msgstr "Innstillingar"
+msgid "FIXME: _Spelling..."
+msgstr "&Stavekontroll ..."
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:137
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Skriv ut alle"
+msgid "_Forms"
+msgstr "Forum"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-contact-editor.xml:142
 #, fuzzy
-msgid "Calendar Preferences..."
-msgstr "Innstillingar"
+msgid "FIXME: _New Contact"
+msgstr "Se&nd avtale"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-contact-editor.xml:146
 #, fuzzy
-msgid "Create a new appointment"
-msgstr "&Slett avtale"
+msgid "FIXME: New _Message to Contact"
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "Create a new calendar"
-msgstr "Feil ved opning"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "&Stavekontroll ..."
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "Ny oppgц╔ve"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Kopier til mappe"
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-contact-editor.xml:154
 #, fuzzy
-msgid "Go to"
-msgstr "Gц╔ til side"
+msgid "FIXME: _Open Web Page"
+msgstr "&Stavekontroll ..."
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-contact-editor.xml:156
 #, fuzzy
-msgid "Go to a specific date"
-msgstr "Gц╔ til side"
+msgid "FIXME: Forward as _vCard"
+msgstr "Fort framover"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-contact-editor.xml:157
 #, fuzzy
-msgid "Go to present time"
+msgid "FIXME: For_ward"
+msgstr "Fort framover"
+
+#: ui/evolution-contact-editor.xml:169
+#, fuzzy
+msgid "_Insert"
+msgstr "Set inn"
+
+#: ui/evolution-contact-editor.xml:170
+#, fuzzy
+msgid "F_ormat"
+msgstr "Format"
+
+#: ui/evolution-contact-editor.xml:171
+#, fuzzy
+msgid "_Tools"
+msgstr "Verktц╦y"
+
+#: ui/evolution-contact-editor.xml:172
+#, fuzzy
+msgid "Actio_ns"
+msgstr "Handlingar"
+
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Fц╦rre"
+
+#: ui/evolution-contact-editor.xml:247
+#, fuzzy
+msgid "Go to the previous item"
+msgstr "Gц╔ til neste som treng ettersyn"
+
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "Finn neste"
+
+#: ui/evolution-contact-editor.xml:250
+#, fuzzy
+msgid "Go to the next item"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mц╔nad"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Mellombels"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Oppteke"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
 #, fuzzy
-msgid "Next"
-msgstr "Neste"
+msgid "Out of Office"
+msgstr "Kontor"
 
-#: ui/evolution-calendar.xml.h:21
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #, fuzzy
-msgid "Open a calendar"
-msgstr "Feil ved opning"
+msgid "No Information"
+msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:22
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 #, fuzzy
-msgid "Prev"
-msgstr "Fц╦rehandsvising:"
+msgid "_Invite Others..."
+msgstr "Andre ..."
 
-#: ui/evolution-calendar.xml.h:24
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-msgid "Print this calendar"
-msgstr "Skriv ut alle"
+msgid "_Options"
+msgstr "Val"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#, fuzzy
+msgid "Show _Zoomed Out"
+msgstr "Forminsk"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #, fuzzy
-msgid "Show 1 day"
-msgstr "Vis dato"
+msgid "_Update Free/Busy"
+msgstr "Oppdateringsfrekvens"
 
-#: ui/evolution-calendar.xml.h:27
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 #, fuzzy
-msgid "Show 1 month"
-msgstr "Vis metodar"
+msgid "_<<"
+msgstr "<<"
 
-#: ui/evolution-calendar.xml.h:28
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #, fuzzy
-msgid "Show 1 week"
-msgstr "Vis %1"
+msgid "_Autopick"
+msgstr "Automatisk"
 
-#: ui/evolution-calendar.xml.h:29
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 #, fuzzy
-msgid "Show the working week"
-msgstr "Vis hovudvindauget"
+msgid ">_>"
+msgstr ">>"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#, fuzzy
+msgid "_All People and Resources"
+msgstr "Alle filer og katalogar"
+
+#: 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
+#, fuzzy
+msgid "Meeting _start time:"
+msgstr "&Helsingstekst:"
+
+#: 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
+#, fuzzy
+msgid "All Attendees"
+msgstr "Kontaktar"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+#, fuzzy
+msgid "%B %Y"
+msgstr "%1 %2"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr " ..."
+
+#: widgets/misc/e-dateedit.c:407
+#, fuzzy
+msgid "Now"
+msgstr "&No"
+
+#: widgets/misc/e-dateedit.c:413
 #, fuzzy
 msgid "Today"
 msgstr "i dag"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Veke"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+#, fuzzy
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 #, fuzzy
-msgid "_New"
-msgstr "Vis"
+msgid "%I:%M %p"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:33
+#: widgets/misc/e-search-bar.c:176
 #, fuzzy
-msgid "_Open Calendar"
-msgstr "Feil ved opning"
+msgid "Sear_ch"
+msgstr "Sц╦k"
+
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, fuzzy, c-format
+msgid "Group %i"
+msgstr "Gruppe %1"
 
-#: ui/evolution-calendar.xml.h:34
 #, fuzzy
-msgid "_Print this calendar"
-msgstr "Skriv ut alle"
+#~ msgid "Delete Contact?"
+#~ msgstr "Slett kolonne"
 
-#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save As..."
-msgstr "Lagra som ..."
+#~ msgid "Address _2:"
+#~ msgstr "Adresse"
 
-#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
-msgid "Delete this item"
-msgstr "Slett denne adressa"
+#~ msgid "Check Address"
+#~ msgstr "Alternativ adresse"
 
-#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
-msgid "Delete..."
-msgstr "Slett"
+#~ msgid "Countr_y:"
+#~ msgstr "Land:"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr ""
+#, fuzzy
+#~ msgid "_Address:"
+#~ msgstr "Adresse"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr ""
+#, fuzzy
+#~ msgid "_City:"
+#~ msgstr "Stad:"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 #, fuzzy
-msgid "Print this item"
-msgstr "Skriv til fil"
+#~ msgid "_PO Box:"
+#~ msgstr "Postboks"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 #, fuzzy
-msgid "Print..."
-msgstr "Skriv ut"
+#~ msgid "_State/Province:"
+#~ msgstr "Stat/provins"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-msgid "Save _As..."
-msgstr "Lagra som ..."
+#~ msgid "_ZIP Code:"
+#~ msgstr "ZIP/Postnummer"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 #, fuzzy
-msgid "Save and Close"
-msgstr "Lagra ei fil"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Kjelde:"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr ""
+#, fuzzy
+#~ msgid "URI"
+#~ msgstr "URL"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "Finn ..."
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 #, fuzzy
-msgid "See online help"
-msgstr "Me er tilkopla!"
+#~ msgid "Message Recipients"
+#~ msgstr "Melding motteken"
 
-#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "Sender ei melding til ein nettverksspelar"
+#~ msgid "Select Names"
+#~ msgstr "Merk omrц╔de"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
 #, fuzzy
-msgid "_File"
-msgstr "Fil"
+#~ msgid "Select name from:"
+#~ msgstr "Vel ei gruppe fц╦rst."
 
-#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
-msgid "_Print..."
-msgstr "Skriv ut"
+#~ msgid "a"
+#~ msgstr "am"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
-msgid "_Save"
-msgstr "Lagra"
+#~ msgid "b"
+#~ msgstr "av"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
+#, fuzzy
+#~ msgid "c"
+#~ msgstr "cm"
 
-#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
-msgid "About..."
-msgstr "Skrifttype ..."
+#~ msgid "d"
+#~ msgstr "Id"
 
-#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
-msgid "Actio_ns"
-msgstr "Handlingar"
+#~ msgid "g"
+#~ msgstr "gs"
 
-#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
-msgid "C_lear"
-msgstr "Teikn"
+#~ msgid "i"
+#~ msgstr "er"
 
-#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
-msgid "C_ut"
-msgstr "Klipp ut"
+#~ msgid "k"
+#~ msgstr "Ok"
 
-#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
-msgid "Clear"
-msgstr "Teikn"
+#~ msgid "m"
+#~ msgstr "ms"
 
-#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
-msgid "Clear the selection"
-msgstr "Slettar den valte fila"
+#~ msgid "n"
+#~ msgstr "Pц╔"
 
-#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
-msgid "Close this appointment"
-msgstr "&Slett avtale"
+#~ msgid "o"
+#~ msgstr "Nei"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopier"
+#, fuzzy
+#~ msgid "p"
+#~ msgstr "pm"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+#, fuzzy
+#~ msgid "r"
+#~ msgstr "Dr"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Klipp ut"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr ""
+#, fuzzy
+#~ msgid "t"
+#~ msgstr "Qt"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#, fuzzy
+#~ msgid "x"
+#~ msgstr "Tx"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#, fuzzy
+#~ msgid "y"
+#~ msgstr "av"
 
-#: ui/evolution-event-editor.xml.h:23
 #, fuzzy
-msgid "FIXME: Address _Book..."
-msgstr "Adresse&bok ..."
+#~ msgid "z"
+#~ msgstr "Hz"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#~ msgid "Body"
+#~ msgstr "Kropp"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr ""
+#~ msgid "Bottom:"
+#~ msgstr "Botn:"
 
-#: ui/evolution-event-editor.xml.h:26
 #, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopier til mappe"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensjonar"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#~ msgid "Font..."
+#~ msgstr "Skrifttype ..."
+
+#~ msgid "Fonts"
+#~ msgstr "Skrifttypar"
 
-#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "&Fц╦rehandsvising ..."
+#~ msgid "Footer:"
+#~ msgstr "Botntekst"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#~ msgid "Header"
+#~ msgstr "Dekl."
 
-#: ui/evolution-event-editor.xml.h:31
 #, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Fort framover"
+#~ msgid "Header/Footer"
+#~ msgstr "&Topp-/botntekst ..."
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+#, fuzzy
+#~ msgid "Headings"
+#~ msgstr "Les"
 
-#: ui/evolution-event-editor.xml.h:33
 #, fuzzy
-msgid "FIXME: Help"
-msgstr "&KDE-hjelp"
+#~ msgid "Headings for each letter"
+#~ msgstr "Les mapper"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
+#~ msgid "Height:"
+#~ msgstr "Hц╦gd:"
 
-#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
-msgid "FIXME: Insert File"
-msgstr "Sett inn fil ..."
+#~ msgid "Include:"
+#~ msgstr "Inkluder fil"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
+#~ msgid "Landscape"
+#~ msgstr "Liggjande"
+
+#~ msgid "Left:"
+#~ msgstr "Venstre:"
 
-#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
-msgid "FIXME: Paste _Special... "
-msgstr "Lim inn spesiell ..."
+#~ msgid "Margins"
+#~ msgstr "&Marg"
 
-#: ui/evolution-event-editor.xml.h:38
 #, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "&Fц╦rehandsvising ..."
+#~ msgid "Number of columns:"
+#~ msgstr "Tal pц╔ kolonnar:"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#~ msgid "Options"
+#~ msgstr "Val"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#~ msgid "Orientation"
+#~ msgstr "Retning"
+
+#~ msgid "Page"
+#~ msgstr "Side"
 
-#: ui/evolution-event-editor.xml.h:41
 #, fuzzy
-msgid "FIXME: Rec_urrence..."
-msgstr "Repetering"
+#~ msgid "Page Setup:"
+#~ msgstr "Speloppsett"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#~ msgid "Paper"
+#~ msgstr "Papir"
 
-#: ui/evolution-event-editor.xml.h:43
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Smarte vedlegg"
+#~ msgid "Paper source:"
+#~ msgstr "Papir&storleik:"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#~ msgid "Portrait"
+#~ msgstr "Stц╔ande"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Preview:"
+#~ msgstr "Fц╦rehandsvising:"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr ""
+#, fuzzy
+#~ msgid "Print using gray shading"
+#~ msgstr "Skriv med grц╔nyansar"
 
-#: ui/evolution-event-editor.xml.h:47
 #, fuzzy
-msgid "FIXME: _Customize..."
-msgstr "Tilpass ..."
+#~ msgid "Reverse on even pages"
+#~ msgstr "Merk partal-sider"
+
+#~ msgid "Right:"
+#~ msgstr "Hц╦gre:"
 
-#: ui/evolution-event-editor.xml.h:48
 #, fuzzy
-msgid "FIXME: _File..."
-msgstr "Sett inn fil ..."
+#~ msgid "Sections:"
+#~ msgstr "Del:"
 
-#: ui/evolution-event-editor.xml.h:49
 #, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Skrifttype ..."
+#~ msgid "Shading"
+#~ msgstr "Lagring"
+
+#~ msgid "Size:"
+#~ msgstr "Storleik:"
 
-#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "Tekstformatering"
+#~ msgid "Start on a new page"
+#~ msgstr "Startar nytt spel ..."
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#, fuzzy
+#~ msgid "Style name:"
+#~ msgstr "Typenamn:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr ""
+#~ msgid "Top:"
+#~ msgstr "Topp:"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#~ msgid "Type:"
+#~ msgstr "Type:"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr ""
+#~ msgid "Width:"
+#~ msgstr "Breidd:"
 
-#: ui/evolution-event-editor.xml.h:55
 #, fuzzy
-msgid "FIXME: _Memo Style"
-msgstr "Elementstil"
+#~ msgid "label26"
+#~ msgstr "Etikett"
 
-#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "Flytt til mappe"
+#~ msgid "Calendar Server"
+#~ msgstr "Skriv ut alle"
 
-#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "Se&nd avtale"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Tilgjengelege lenkjer:"
 
-#: ui/evolution-event-editor.xml.h:59
 #, fuzzy
-msgid "FIXME: _Object..."
-msgstr "&Objekt ..."
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "ц≤ydelagd oppsettfil."
 
-#: ui/evolution-event-editor.xml.h:60
 #, fuzzy
-msgid "FIXME: _Paragraph..."
-msgstr "&Avsnitt ..."
+#~ msgid "Edit appointment"
+#~ msgstr "&Endra avtale ..."
 
-#: ui/evolution-event-editor.xml.h:61
 #, fuzzy
-msgid "FIXME: _Spelling..."
-msgstr "&Stavekontroll ..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Lц╔g grense (minutt):"
 
-#: ui/evolution-event-editor.xml.h:62
 #, fuzzy
-msgid "FIXME: _Standard"
-msgstr "Standard"
+#~ msgid "05 minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#, fuzzy
+#~ msgid "10 minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#, fuzzy
+#~ msgid "15 minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#, fuzzy
+#~ msgid "24 hour"
+#~ msgstr "time/timar"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 #, fuzzy
-msgid "F_ormat"
-msgstr "Format"
+#~ msgid "30 minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#, fuzzy
+#~ msgid "60 minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Calendar"
+#~ msgstr "Skriv ut alle"
 
-#: ui/evolution-event-editor.xml.h:70
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Ikkje vis den overskytande teksten"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Innstillingar"
+
+#~ msgid "Colors"
+#~ msgstr "Fargar"
+
+#~ msgid "Defaults"
+#~ msgstr "Standard"
 
-#: ui/evolution-event-editor.xml.h:71
 #, fuzzy
-msgid "Go to the previous item"
-msgstr "Gц╔ til neste som treng ettersyn"
+#~ msgid "Display options"
+#~ msgstr "Vis"
 
-#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Linjeeigenskapar"
+#~ msgid "End of day:"
+#~ msgstr "Slutt trekk"
 
-#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "Neste"
+#~ msgid "Highlight"
+#~ msgstr "Opplysing:"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Lim inn"
+#, fuzzy
+#~ msgid "Items Due Today"
+#~ msgstr "&Opplys syntaks"
 
-#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "Limer inn ..."
+#~ msgid "Overdue Items"
+#~ msgstr "&Syntaksmerkingsmodusar"
 
-#: ui/evolution-event-editor.xml.h:77
 #, fuzzy
-msgid "Pre_vious"
-msgstr "Fц╦rre"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "&Slett avtale"
 
-#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "Fц╦rre"
+#~ msgid "Reminders"
+#~ msgstr "Pц╔minning:"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr ""
+#, fuzzy
+#~ msgid "Show week numbers"
+#~ msgstr "Vis %1"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "Speloppsett"
+#~ msgid "Start of day:"
+#~ msgstr "Start-dato"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "Eigenskapar ..."
+#~ msgid "TaskPad"
+#~ msgstr "Oppgц╔ve"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "Tilfeldig"
+#~ msgid "Time Until Due"
+#~ msgstr "Tid og dato"
 
-#: ui/evolution-event-editor.xml.h:85
 #, fuzzy
-msgid "Redo the undone action"
-msgstr "Fjern ein kolonne"
+#~ msgid "Time divisions:"
+#~ msgstr "Dimensjonar"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "Svar"
+#~ msgid "Time format:"
+#~ msgstr "Tidsformat:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarm"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
+#, fuzzy
+#~ msgid "Work week"
+#~ msgstr "Veke"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
-msgid "Save the current file"
-msgstr "tid no"
+#~ msgid "seconds."
+#~ msgstr "sekund"
 
-#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
-msgid "Schedule Meeting"
-msgstr "Kц╦yreplan ..."
+#~ msgid "% Comp_lete:"
+#~ msgstr "Ferdig"
 
-#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "Kц╦yreplan ..."
+#~ msgid "C_lassification:"
+#~ msgstr "&Forstц╦rring"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "Completed"
+#~ msgstr "Ferdig"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "Date Completed:"
+#~ msgstr "Ferdig"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#, fuzzy
+#~ msgid "High"
+#~ msgstr "Hц╦gd"
 
-#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "Vel mappe"
+#~ msgid "In Progress"
+#~ msgstr "Framgong:"
 
-#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
-msgid "Select everything"
-msgstr "Vel mappe"
+#~ msgid "Low"
+#~ msgstr "Senk"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
+#, fuzzy
+#~ msgid "Not Started"
+#~ msgstr "Starta"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#, fuzzy
+#~ msgid "S_ummary"
+#~ msgstr "Samandrag"
+
+#~ msgid "Task"
+#~ msgstr "Oppgц╔ve"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
-msgid "_About..."
-msgstr "Skrifttype ..."
+#~ msgid "_Contacts..."
+#~ msgstr "&Innhald ..."
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
-msgid "_Close"
-msgstr "Lukk"
+#~ msgid "_Due Date:"
+#~ msgstr "Forfallsdato:"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "Kopier"
+#~ msgid "_Priority:"
+#~ msgstr "Prioritet:"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#, fuzzy
+#~ msgid "_Status:"
+#~ msgstr "Status:"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 #, fuzzy
-msgid "_Edit"
-msgstr "Rediger"
+#~ msgid "Appointment Basics"
+#~ msgstr "Avtale"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "Finn ..."
+#~ msgid "Custom recurrence"
+#~ msgstr "Repetering"
 
-#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
-msgid "_Forms"
-msgstr "Forum"
+#~ msgid "Days"
+#~ msgstr "Dag"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
 #, fuzzy
-msgid "_Help"
-msgstr "Heim"
+#~ msgid "Every"
+#~ msgstr "kvar"
+
+#~ msgid "Exceptions"
+#~ msgstr "Unntak"
 
-#: ui/evolution-event-editor.xml.h:114
 #, fuzzy
-msgid "_Insert"
-msgstr "Set inn"
+#~ msgid "Hours"
+#~ msgstr "time/timar"
 
-#: ui/evolution-event-editor.xml.h:115
 #, fuzzy
-msgid "_Object"
-msgstr "Objekt"
+#~ msgid "Mail _to:"
+#~ msgstr "E-post:"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "Lim inn"
+#~ msgid "Minutes"
+#~ msgstr "minutt"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "Skriv ut"
+#~ msgid "Modify"
+#~ msgstr "Mц╔ndag"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "Eigenskapar ..."
+#~ msgid "No recurrence"
+#~ msgstr "Repetering"
 
-#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
-msgid "_Redo"
-msgstr "Tilfeldig"
+#~ msgid "Preview"
+#~ msgstr "Fц╦rehandsvising:"
 
-#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
-msgid "_Replace..."
-msgstr "Opna ..."
+#~ msgid "Pri_vate"
+#~ msgstr "Privat"
 
-#: ui/evolution-event-editor.xml.h:122
 #, fuzzy
-msgid "_Toolbars"
-msgstr "Verktц╦ylinjer"
+#~ msgid "Pu_blic"
+#~ msgstr "Praksis"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr ""
+#~ msgid "Recurrence"
+#~ msgstr "Repetering"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
 #, fuzzy
-msgid "Compose"
-msgstr "Lukk"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for repetering"
 
-#: ui/evolution-mail.xml.h:7
 #, fuzzy
-msgid "Compose a new message"
-msgstr "Lukk melding"
+#~ msgid "Reminder"
+#~ msgstr "Pц╔minning:"
 
-#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "&Kopier bileteplassering"
+#~ msgid "Simple recurrence"
+#~ msgstr "Repetering"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "Mapper"
+#~ msgid "Su_mmary:"
+#~ msgstr "Samandrag:"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
 
-#: ui/evolution-mail.xml.h:14
 #, fuzzy
-msgid "Fi_lter on Sender"
-msgstr "Fil under:"
+#~ msgid "_Audio"
+#~ msgstr "Lyd"
 
-#: ui/evolution-mail.xml.h:15
 #, fuzzy
-msgid "Filter on Rec_ipients"
-msgstr "Skriv ut filer"
+#~ msgid "_Confidential"
+#~ msgstr "Eksponentiell"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr ""
+#, fuzzy
+#~ msgid "_End time:"
+#~ msgstr "Slutt-tid:"
 
-#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Get Mail"
-msgstr "Detaljar"
+#~ msgid "_Mail"
+#~ msgstr "Send"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Neste melding"
+#~ msgid "_Program"
+#~ msgstr "Program"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Vidaresendt melding frц╔ %1"
+#~ msgid "_Run program:"
+#~ msgstr "Terminalprogram:"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Sentrer dei valte elementa"
+#~ msgid "_Start time:"
+#~ msgstr "Start-tid:"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "E-post:"
+#~ msgid "_Starting date:"
+#~ msgstr "Start-dato"
+
+#~ msgid "day(s)"
+#~ msgstr "dag(ar)"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Skildring:"
+#~ msgid "event-editor-dialog"
+#~ msgstr "Opnar angrehistoriedialogen"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#, fuzzy
+#~ msgid "for"
+#~ msgstr "Munnar"
 
-#: ui/evolution-mail.xml.h:28
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Mar&ker som ulesen"
+#~ msgid "forever"
+#~ msgstr "Repeterer for alltid"
 
-#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Move"
-msgstr "Mц╔n"
+#~ msgid "label21"
+#~ msgstr "Etikett"
+
+#~ msgid "month(s)"
+#~ msgstr "mц╔nad(er)"
 
-#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Move message to a new folder"
-msgstr "Lagra side til ascii-fil"
+#~ msgid "until"
+#~ msgstr "utan tittel"
 
-#: ui/evolution-mail.xml.h:31
 #, fuzzy
-msgid "Previews the message to be printed"
-msgstr "Sen melding"
+#~ msgid "week(s)"
+#~ msgstr "veke(r) pц╔:"
+
+#~ msgid "year(s)"
+#~ msgstr "ц╔r"
 
-#: ui/evolution-mail.xml.h:33
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "&Fц╦rehandsvising ..."
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#, fuzzy
+#~ msgid "April"
+#~ msgstr "April"
 
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "Private meldingar"
+#~ msgid "August"
+#~ msgstr "August"
 
-#: ui/evolution-mail.xml.h:39
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Svar til alle:"
+#~ msgid "December"
+#~ msgstr "Desember"
 
-#: ui/evolution-mail.xml.h:40
 #, fuzzy
-msgid "Reply to _Sender"
-msgstr "Svar til avsendar:"
+#~ msgid "February"
+#~ msgstr "Februar"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-msgid "Select _All"
-msgstr "Vel mappe"
+#~ msgid "Go To Date"
+#~ msgstr "Gц╔ til side"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Gц╔ til &i dag"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Vidaresendt melding frц╔ %1"
+#~ msgid "January"
+#~ msgstr "Januar"
 
-#: ui/evolution-mail.xml.h:46
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Vidaresendt melding frц╔ %1"
+#~ msgid "July"
+#~ msgstr "Juli"
 
-#: ui/evolution-mail.xml.h:47
 #, fuzzy
-msgid "VFolder on Se_nder"
-msgstr "Mappenamn:"
+#~ msgid "June"
+#~ msgstr "Juni"
 
-#: ui/evolution-mail.xml.h:48
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "Mappa finst: "
+#~ msgid "March"
+#~ msgstr "Mars"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Mц╔ndag"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "November"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr ""
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "Oktober"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "Kopier til mappe"
+#~ msgid "September"
+#~ msgstr "September"
 
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "Legg til melding"
+#~ msgid "Attachment properties"
+#~ msgstr "Vedleggseigenskapar"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
+#~ msgid "File name:"
+#~ msgstr "Filnamn:"
 
-#: ui/evolution-mail.xml.h:56
 #, fuzzy
-msgid "_Filter on Subject"
-msgstr "Ingen emne"
+#~ msgid "MIME type:"
+#~ msgstr "MIME-type"
 
-#: ui/evolution-mail.xml.h:57
 #, fuzzy
-msgid "_Forward"
-msgstr "Fram"
+#~ msgid "Edit VFolders"
+#~ msgstr "Rediger filterreglar"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#, fuzzy
+#~ msgid "Filter Rules"
+#~ msgstr "Filter-reglar"
 
-#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration..."
-msgstr "Oppsett"
+#~ msgid "Outgoing"
+#~ msgstr "Oversikt"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "Legg til melding"
+#~ msgid "Virtual Folders"
+#~ msgstr "Mapper"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "Flytt til mappe"
+#~ msgid "vFolder Sources"
+#~ msgstr "Kjelder"
+
+#~ msgid "Save"
+#~ msgstr "Lagra"
 
-#: ui/evolution-mail.xml.h:62
 #, fuzzy
-msgid "_Open in New Window"
-msgstr "&Opna i eige vindauge"
+#~ msgid "Hide read"
+#~ msgstr "Skjul"
 
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "Private meldingar"
+#~ msgid "Hide deleted"
+#~ msgstr "Slett"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Lagra melding"
+#~ msgid "Hide Subject"
+#~ msgstr "Emne"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Kjelder"
+#~ msgid "Hide from Sender"
+#~ msgstr "Fil under:"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Lagra melding"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "Slett"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Emne"
 
-#: ui/evolution-mail.xml.h:68
 #, fuzzy
-msgid "_VFolder on Subject"
-msgstr "Ingen emne"
+#~ msgid "Current store format:"
+#~ msgstr "Kunne ikkje starta %1."
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Mapper"
+#~ msgid "Mailbox Format"
+#~ msgstr "Format"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Attach"
-msgstr "&Legg ved"
+#~ msgid "New store format:"
+#~ msgstr "&Ny type"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "tid no"
+#~ msgid "mh"
+#~ msgstr "ms"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Lagra melding"
+#~ msgid "Account Information"
+#~ msgstr "Informasjon"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Vedleggseigenskapar"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Oppgi eit nytt namn pц╔ meldinga."
+#~ msgid "Advanced"
+#~ msgstr "Legg til ..."
 
-#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-msgid "Insert text file..."
-msgstr "Sett inn fil ..."
+#~ msgid "Authentication"
+#~ msgstr "Autentisering:"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Opna fil"
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentisering:"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "Slett e-post frц╔ tenaren"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Ingen"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "Lagra"
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-post-adresse:"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Lagrar fil ..."
+#~ msgid "Email Address:"
+#~ msgstr "E-post-adresse:"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Lagrar fil ..."
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Oppsett"
 
-#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-msgid "Save the current file with a different name"
-msgstr "Sender ei melding til ein nettverksspelar"
+#~ msgid "Full Name:"
+#~ msgstr "Fullt namn"
 
-#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Save the message in a specified folder"
-msgstr "Lagra side til ascii-fil"
+#~ msgid "Hostname:"
+#~ msgstr "Brukarnamn:"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Send"
+#~ msgid "Identity"
+#~ msgstr "Identitet"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "Send &seinare"
+#~ msgid "Mail"
+#~ msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "Send &seinare"
+#~ msgid "Mail Account"
+#~ msgstr "Smц╔ ikon"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Configuration"
+#~ msgstr "Oppsett"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Sen melding"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Oppsett"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Sen melding"
+#~ msgid "News"
+#~ msgstr "Ny ..."
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Sen melding"
+#~ msgid "Optional"
+#~ msgstr "Val"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisasjon:"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Vedlegg som ikon"
+#~ msgid "Reply-to:"
+#~ msgstr "Svar"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "Vedlegg"
+#~ msgid "Save password"
+#~ msgstr "Lagra som"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "Vedlegg"
+#~ msgid "Select signature file"
+#~ msgstr "Signaturfil:"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Sender meldingar til %1"
+#~ msgid "Sending Email"
+#~ msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:44
 #, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "Sett inn fil ..."
+#~ msgid "Server Configuration"
+#~ msgstr "Oppsett"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "Opna ..."
+#~ msgid "Server Type: "
+#~ msgstr "Tenar:"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Tenar:"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Signaturfil:"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#~ msgid "Sources"
+#~ msgstr "Kjelder"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Type"
+#~ msgstr "Type:"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "User Information"
+#~ msgstr "Informasjon"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "Brukarnamn:"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr ""
+#, fuzzy
+#~ msgid "minute(s)"
+#~ msgstr "minutt"
 
-#: ui/evolution.xml.h:7
 #, fuzzy
-msgid "E_xit"
-msgstr "Avslutt"
+#~ msgid "Full name:"
+#~ msgstr "Fullt namn"
+
+#~ msgid "Email address:"
+#~ msgstr "E-post-adresse:"
 
-#: ui/evolution.xml.h:8
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evalueringsfeil"
+#~ msgid "Signature File"
+#~ msgstr "Signaturfil:"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
+#~ msgid "Server:"
+#~ msgstr "Tenar:"
 
-#: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Starta"
+#~ msgid "Detect supported types..."
+#~ msgstr "Vel modemtype ..."
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
+#, fuzzy
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Slett e-post frц╔ tenaren"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Test Settings"
+#~ msgstr "Skriftinnstillingar"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail source type:"
+#~ msgstr "E-post-&transport:"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
+#, fuzzy
+#~ msgid "News source type:"
+#~ msgstr "&Ny type"
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
+#, fuzzy
+#~ msgid "Mail transport type:"
+#~ msgstr "E-post-&transport:"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Add Identity"
+#~ msgstr " Identitet"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit Identity"
+#~ msgstr " Identitet"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#, fuzzy
+#~ msgid "Add Source"
+#~ msgstr "Kjelde:"
 
-#: ui/evolution.xml.h:19
 #, fuzzy
-msgid "Using the _Calendar"
-msgstr "Skriv ut alle"
+#~ msgid "Edit Source"
+#~ msgstr "Endra teneste"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#, fuzzy
+#~ msgid "Add News Server"
+#~ msgstr "Legg til tenar"
 
-#: ui/evolution.xml.h:21
 #, fuzzy
-msgid "_About Evolution..."
-msgstr "Opplц╦ysing"
+#~ msgid "Edit News Server"
+#~ msgstr "R&ediger tenarar"
 
-#: ui/evolution.xml.h:22
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "Avtale"
+#~ msgid "Testing \"%s\""
+#~ msgstr "Lagar"
 
-#: ui/evolution.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Comment=X-redigering"
+#~ msgid "The connection was successful!"
+#~ msgstr "Sambandet er brote."
+
+#~ msgid "Address"
+#~ msgstr "Adresse"
 
-#: ui/evolution.xml.h:26
 #, fuzzy
-msgid "_Folder"
-msgstr "Mapper"
+#~ msgid "Identities"
+#~ msgstr "Identifikator"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "Flytt til mappe"
+#~ msgid "Mail Sources"
+#~ msgstr "Kjelder"
 
-#: ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Index"
-msgstr "Set inn"
+#~ msgid "Mail Transport"
+#~ msgstr "&E-post-transport"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Lag meldingar og slц╔ saman"
 
-#: ui/evolution.xml.h:32
 #, fuzzy
-msgid "_Settings"
-msgstr "Skriftinnstillingar"
+#~ msgid "News Servers"
+#~ msgstr "Diskusjonsgruppetenarar"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "News Sources"
+#~ msgstr "Kjelder"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Send meldingar:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Mellombels"
+#, fuzzy
+#~ msgid "Delete a contact"
+#~ msgstr "Slett kolonne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Oppteke"
+#, fuzzy
+#~ msgid "Find"
+#~ msgstr "Finn ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
 #, fuzzy
-msgid "Out of Office"
-msgstr "Kontor"
+#~ msgid "Stop Loading"
+#~ msgstr "Lagring"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #, fuzzy
-msgid "No Information"
-msgstr "Informasjon"
+#~ msgid "View All"
+#~ msgstr "Vinkel"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 #, fuzzy
-msgid "_Invite Others..."
-msgstr "Andre ..."
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Oppsett"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-msgid "_Options"
-msgstr "Val"
+#~ msgid "_Print Contacts..."
+#~ msgstr "&Innhald ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr " dag"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
 #, fuzzy
-msgid "Show _Zoomed Out"
-msgstr "Forminsk"
+#~ msgid "Alter preferences"
+#~ msgstr "Innstillingar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #, fuzzy
-msgid "_Update Free/Busy"
-msgstr "Oppdateringsfrekvens"
+#~ msgid "Ca_lendar"
+#~ msgstr "Skriv ut alle"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 #, fuzzy
-msgid "_<<"
-msgstr "<<"
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Innstillingar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #, fuzzy
-msgid "_Autopick"
-msgstr "Automatisk"
+#~ msgid "Create a new appointment"
+#~ msgstr "&Slett avtale"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 #, fuzzy
-msgid ">_>"
-msgstr ">>"
+#~ msgid "Create a new calendar"
+#~ msgstr "Feil ved opning"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 #, fuzzy
-msgid "_All People and Resources"
-msgstr "Alle filer og katalogar"
+#~ msgid "Go to"
+#~ msgstr "Gц╔ til side"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "Go to a specific date"
+#~ msgstr "Gц╔ til side"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#, fuzzy
+#~ msgid "Go to present time"
+#~ msgstr "Ikkje vis den overskytande teksten"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#~ msgid "Month"
+#~ msgstr "Mц╔nad"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #, fuzzy
-msgid "Meeting _start time:"
-msgstr "&Helsingstekst:"
+#~ msgid "Open a calendar"
+#~ msgstr "Feil ved opning"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
+#, fuzzy
+#~ msgid "Prev"
+#~ msgstr "Fц╦rehandsvising:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #, fuzzy
-msgid "All Attendees"
-msgstr "Kontaktar"
+#~ msgid "Print this calendar"
+#~ msgstr "Skriv ut alle"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#, fuzzy
+#~ msgid "Show 1 day"
+#~ msgstr "Vis dato"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 #, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
+#~ msgid "Show 1 month"
+#~ msgstr "Vis metodar"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr " ..."
+#, fuzzy
+#~ msgid "Show 1 week"
+#~ msgstr "Vis %1"
 
-#: widgets/misc/e-dateedit.c:407
 #, fuzzy
-msgid "Now"
-msgstr "&No"
+#~ msgid "Show the working week"
+#~ msgstr "Vis hovudvindauget"
+
+#~ msgid "Week"
+#~ msgstr "Veke"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
 #, fuzzy
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "_New"
+#~ msgstr "Vis"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
 #, fuzzy
-msgid "%I:%M %p"
-msgstr "%H:%M"
+#~ msgid "_Open Calendar"
+#~ msgstr "Feil ved opning"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, fuzzy, c-format
-msgid "Group %i"
-msgstr "Gruppe %1"
+#, fuzzy
+#~ msgid "_Print this calendar"
+#~ msgstr "Skriv ut alle"
 
 #, fuzzy
-#~ msgid "categories"
-#~ msgstr "Kategoriar"
+#~ msgid "_Save As..."
+#~ msgstr "Lagra som ..."
 
 #, fuzzy
-#~ msgid "Available Categories:"
-#~ msgstr "Tilgjengelege kategoriar"
+#~ msgid "Delete this item"
+#~ msgstr "Slett denne adressa"
+
+#, fuzzy
+#~ msgid "Delete..."
+#~ msgstr "Slett"
+
+#, fuzzy
+#~ msgid "Print this item"
+#~ msgstr "Skriv til fil"
+
+#, fuzzy
+#~ msgid "Print..."
+#~ msgstr "Skriv ut"
+
+#, fuzzy
+#~ msgid "Save _As..."
+#~ msgstr "Lagra som ..."
+
+#, fuzzy
+#~ msgid "Save and Close"
+#~ msgstr "Lagra ei fil"
+
+#, fuzzy
+#~ msgid "See online help"
+#~ msgstr "Me er tilkopla!"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Fil"
+
+#, fuzzy
+#~ msgid "_Print..."
+#~ msgstr "Skriv ut"
+
+#, fuzzy
+#~ msgid "_Save"
+#~ msgstr "Lagra"
+
+#, fuzzy
+#~ msgid "About..."
+#~ msgstr "Skrifttype ..."
+
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "Teikn"
+
+#, fuzzy
+#~ msgid "C_ut"
+#~ msgstr "Klipp ut"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Teikn"
+
+#, fuzzy
+#~ msgid "Clear the selection"
+#~ msgstr "Slettar den valte fila"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "&Slett avtale"
+
+#~ msgid "Copy"
+#~ msgstr "Kopier"
+
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
+
+#, fuzzy
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "Adresse&bok ..."
+
+#, fuzzy
+#~ msgid "FIXME: Help"
+#~ msgstr "&KDE-hjelp"
+
+#, fuzzy
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Repetering"
+
+#, fuzzy
+#~ msgid "Modify the file's properties"
+#~ msgstr "Linjeeigenskapar"
+
+#, fuzzy
+#~ msgid "N_ext"
+#~ msgstr "Neste"
+
+#~ msgid "Paste"
+#~ msgstr "Lim inn"
+
+#, fuzzy
+#~ msgid "Paste the clipboard"
+#~ msgstr "Limer inn ..."
+
+#, fuzzy
+#~ msgid "Previous"
+#~ msgstr "Fц╦rre"
+
+#, fuzzy
+#~ msgid "Print Setup"
+#~ msgstr "Speloppsett"
 
 #, fuzzy
-#~ msgid "External Directories"
-#~ msgstr "Separate katalogar"
+#~ msgid "Properties"
+#~ msgstr "Eigenskapar ..."
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Tilfeldig"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Fjern ein kolonne"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Svar"
+
+#, fuzzy
+#~ msgid "Save the current file"
+#~ msgstr "tid no"
+
+#, fuzzy
+#~ msgid "Schedule Meeting"
+#~ msgstr "Kц╦yreplan ..."
+
+#, fuzzy
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Kц╦yreplan ..."
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "Vel mappe"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Vel mappe"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "Skrifttype ..."
+
+#, fuzzy
+#~ msgid "_Close"
+#~ msgstr "Lukk"
+
+#, fuzzy
+#~ msgid "_Copy"
+#~ msgstr "Kopier"
+
+#, fuzzy
+#~ msgid "_Edit"
+#~ msgstr "Rediger"
+
+#, fuzzy
+#~ msgid "_Find..."
+#~ msgstr "Finn ..."
+
+#, fuzzy
+#~ msgid "_Help"
+#~ msgstr "Heim"
+
+#, fuzzy
+#~ msgid "_Paste"
+#~ msgstr "Lim inn"
+
+#, fuzzy
+#~ msgid "_Print"
+#~ msgstr "Skriv ut"
+
+#, fuzzy
+#~ msgid "_Properties..."
+#~ msgstr "Eigenskapar ..."
+
+#, fuzzy
+#~ msgid "_Redo"
+#~ msgstr "Tilfeldig"
+
+#, fuzzy
+#~ msgid "_Replace..."
+#~ msgstr "Opna ..."
+
+#, fuzzy
+#~ msgid "Compose"
+#~ msgstr "Lukk"
+
+#, fuzzy
+#~ msgid "Compose a new message"
+#~ msgstr "Lukk melding"
+
+#, fuzzy
+#~ msgid "Copy message to a new folder"
+#~ msgstr "&Kopier bileteplassering"
+
+#, fuzzy
+#~ msgid "F_older"
+#~ msgstr "Mapper"
+
+#, fuzzy
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fil under:"
+
+#, fuzzy
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Skriv ut filer"
+
+#, fuzzy
+#~ msgid "Get Mail"
+#~ msgstr "Detaljar"
+
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Neste melding"
+
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "Vidaresendt melding frц╔ %1"
+
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Sentrer dei valte elementa"
+
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "E-post:"
+
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Skildring:"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Move"
+#~ msgstr "Mц╔n"
+
+#, fuzzy
+#~ msgid "Move message to a new folder"
+#~ msgstr "Lagra side til ascii-fil"
+
+#, fuzzy
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "&Fц╦rehandsvising ..."
+
+#, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "Private meldingar"
+
+#, fuzzy
+#~ msgid "Reply to _All"
+#~ msgstr "Svar til alle:"
+
+#, fuzzy
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til avsendar:"
+
+#, fuzzy
+#~ msgid "Select _All"
+#~ msgstr "Vel mappe"
+
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Vidaresendt melding frц╔ %1"
+
+#, fuzzy
+#~ msgid "Threaded Message list"
+#~ msgstr "Vidaresendt melding frц╔ %1"
+
+#, fuzzy
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Mappenamn:"
+
+#, fuzzy
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Mappa finst: "
+
+#, fuzzy
+#~ msgid "_Copy to Folder..."
+#~ msgstr "Kopier til mappe"
+
+#, fuzzy
+#~ msgid "_Edit Message"
+#~ msgstr "Legg til melding"
+
+#, fuzzy
+#~ msgid "_Filter on Subject"
+#~ msgstr "Ingen emne"
+
+#, fuzzy
+#~ msgid "_Forward"
+#~ msgstr "Fram"
+
+#, fuzzy
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Oppsett"
+
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "Legg til melding"
+
+#, fuzzy
+#~ msgid "_Move to Folder..."
+#~ msgstr "Flytt til mappe"
+
+#, fuzzy
+#~ msgid "_Open in New Window"
+#~ msgstr "&Opna i eige vindauge"
+
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "Private meldingar"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagra melding"
+
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Kjelder"
+
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "Slett"
+
+#, fuzzy
+#~ msgid "_VFolder on Subject"
+#~ msgstr "Ingen emne"
+
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Mapper"
+
+#, fuzzy
+#~ msgid "Attach"
+#~ msgstr "&Legg ved"
+
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "tid no"
+
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Lagra melding"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Oppgi eit nytt namn pц╔ meldinga."
+
+#, fuzzy
+#~ msgid "Insert text file..."
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Opna fil"
+
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Lagra"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Lagrar fil ..."
+
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Lagrar fil ..."
+
+#, fuzzy
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Sender ei melding til ein nettverksspelar"
+
+#, fuzzy
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Lagra side til ascii-fil"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Send &seinare"
+
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Send &seinare"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Vedlegg som ikon"
+
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "Vedlegg"
+
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Sender meldingar til %1"
+
+#, fuzzy
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "Opna ..."
+
+#, fuzzy
+#~ msgid "E_xit"
+#~ msgstr "Avslutt"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evalueringsfeil"
+
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Starta"
+
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "_About Evolution..."
+#~ msgstr "Opplц╦ysing"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Comment=X-redigering"
+
+#, fuzzy
+#~ msgid "_Folder"
+#~ msgstr "Mapper"
+
+#, fuzzy
+#~ msgid "_Go to Folder..."
+#~ msgstr "Flytt til mappe"
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "Set inn"
+
+#, fuzzy
+#~ msgid "_Settings"
+#~ msgstr "Skriftinnstillingar"
+
+#, fuzzy
+#~ msgid "Available Categories:"
+#~ msgstr "Tilgjengelege kategoriar"
 
 #~ msgid "Port Number:"
 #~ msgstr "Portnummer:"
@@ -7971,18 +7285,6 @@ msgstr "Gruppe %1"
 #~ 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"
 
@@ -7999,41 +7301,10 @@ msgstr "Gruppe %1"
 #~ 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 "
-
-#, fuzzy
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "&Slц╔ saman kalender ..."
 
@@ -8205,15 +7476,6 @@ msgstr "Gruppe %1"
 #~ 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"
diff --git a/po/no.po b/po/no.po
index 884e6344b1..4a961664e0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-09 13:25+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-09 13:28+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,11 +14,186 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan ikke initiere Evolutions e-postkomponent."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX e-post filer i mbox-format"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Ingen slik melding"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Henter e-post fra %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Lukk"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Flytt til mappe"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "GЕ til forrige oppfЬring"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "GЕ til neste oppfЬring"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_KonfigurИr mappe"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kan ikke Еpne fil %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Feil under lesing av postfil: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Ingen feil"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Test tilkobling til \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Kunne ikke koble til POP-tjener pЕ %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Ny"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Opprett en ny mappe"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan ikke initiere Evolutions e-postkomponent."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +201,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +209,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +217,7 @@ msgstr ""
 "\n"
 "Oppgitt:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +225,7 @@ msgstr ""
 "\n"
 "Tillegg: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +233,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +241,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +249,7 @@ msgstr ""
 "\n"
 "FЬdselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +257,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +265,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +273,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +281,7 @@ msgstr ""
 "\n"
 "Gate:     "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +289,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +297,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +305,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +313,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +321,7 @@ msgstr ""
 "\n"
 "Leveringsetikett: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +329,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +337,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +345,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +353,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +361,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +369,7 @@ msgstr ""
 "\n"
 "Tidssone: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +377,7 @@ msgstr ""
 "\n"
 "Geografisk lokasjon: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +385,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +393,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +401,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +409,7 @@ msgstr ""
 "\n"
 "Enhet:  "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +417,7 @@ msgstr ""
 "\n"
 "Enhet2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +425,7 @@ msgstr ""
 "\n"
 "Enhet3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +433,7 @@ msgstr ""
 "\n"
 "Enhet4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +441,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +459,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +467,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -300,17 +475,6 @@ msgstr ""
 "\n"
 "Offentlig nЬkkel: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -430,35 +594,31 @@ msgstr ""
 "En feil oppsto under forsЬk pЕ Е hente\n"
 "pilot-listen fra gnome-pilot daemonen"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "MarkЬren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -469,7 +629,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:48
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -483,9 +643,6 @@ msgid "New phone type"
 msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config-druid.glade.h:5 mail/mail-config.glade.h:1
 msgid "Add"
 msgstr "Legg til"
 
@@ -543,8 +700,6 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -561,8 +716,6 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11
-#: mail/mail-config-druid.glade.h:26
 msgid "General"
 msgstr "Generell"
 
@@ -607,24 +760,27 @@ msgid "No_tes:"
 msgstr "No_tater:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Details"
 msgstr "Detaljer"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Arbeid"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Arbeid 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Faks pЕ arbeid"
 
@@ -633,6 +789,7 @@ msgid "Callback"
 msgstr "Tilbakering"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Bil"
 
@@ -642,28 +799,33 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Annet"
 
@@ -672,10 +834,12 @@ msgid "Other Fax"
 msgstr "Annen faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "PersonsЬker"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "PrimФr"
 
@@ -692,57 +856,15 @@ msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresse _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Sjekk adresse"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "Lan_d:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_By:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_ZIP/Postnummer:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -811,7 +933,6 @@ msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
@@ -845,27 +966,27 @@ msgstr ""
 "installere OpenLDAP, deretter mЕ du kompilere og\n"
 "installere Evolution pЕ nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -890,9 +1011,9 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Passord"
 
@@ -925,12 +1046,10 @@ msgid "Bind DN:"
 msgstr "Bind DN:"
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:27
 msgid "Host:"
 msgstr "Vert:"
 
@@ -947,12 +1066,10 @@ msgid "Search Scope:"
 msgstr "SЬkeomrЕde:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:9 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:46 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sti:"
 
@@ -975,182 +1092,89 @@ msgid ""
 msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:39
 msgid "Name:"
 msgstr "Navn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:19 mail/mail-config.glade.h:3
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-mail.xml.h:6
-msgid "Delete"
-msgstr "Slett"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:22 mail/mail-config.glade.h:4
-msgid "Edit"
-msgstr "RedigИr"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Finn..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Meldingsmottakere:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Velg navn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Velg navn fra:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "SЬk"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Navn"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-post 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "Av_deling:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "Kont_or:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Tittel:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Yrke:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "PersonsЬker"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Kalle_navn:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "Ekte_felle:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Lagre som VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1164,175 +1188,6 @@ msgstr ""
 "\n"
 "Dobbelklikk her for Е opprette en ny kontakt."
 
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blanke skjema pЕ slutten:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Kropp"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bunn:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Skrifttype..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Bunntekst:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Topptekst"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Topp-/bunntekst"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Topptekster"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Topptekst for hver bokstav"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "HЬyde:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Rett etter hverandre"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inkluder:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landskap"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Venstre:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Bokstavfaner pЕ siden"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marger"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Antall kolonner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativer"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Side"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Sideoppsett"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Papirkilde:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portrett"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "ForhЕndsvis:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Skriv ut med grЕtoner"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Motsatt pЕ like sider"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "HЬyre:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Seksjoner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Skyggelegging"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "StЬrrelse:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start pЕ en ny side"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stilnavn:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Topp:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-config-druid.glade.h:68
-msgid "Type:"
-msgstr "Type:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredde:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "etikett26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalender-komponent"
@@ -1341,13 +1196,13 @@ msgstr "Evolution kalender-komponent"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "KonfigurasjonsverktЬy for evolutions kalender-komponent.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
@@ -1359,57 +1214,17 @@ msgstr "Evolution oppgaveliste-komponent"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "KonfigurasjonsverktЬy for evolutions oppgavelistekomponent.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eksempel pЕ Bonobo-kontroll som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
-msgid "Factory for the sample Calendar control"
-msgstr "Factory for eksempelkontroll for kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:1
-msgid "Calendar Repository"
-msgstr "Kalenderlager"
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:2
-msgid "Calendar Server"
-msgstr "Kalendertjener"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution komponent for kalendersammendrag."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponent for hЕndtering av kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory for kalenderens sammendragskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory for Evolution kalender-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory for kalenderens iTip visningskontroll"
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "PЕminnelse om din avtale "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1419,19 +1234,19 @@ msgstr "Utsett"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "еpne kalender"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1439,7 +1254,7 @@ msgstr ""
 "konfigurasjon."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1447,60 +1262,57 @@ msgstr "%a %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:326
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:329
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:332
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "ь"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1512,7 +1324,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1520,27 +1332,27 @@ msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:845
+#: calendar/gui/calendar-model.c:893
 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:848
+#: calendar/gui/calendar-model.c:896
 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:852
+#: calendar/gui/calendar-model.c:900
 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:855
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1550,620 +1362,287 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien mЕ vФre mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mЕ vФre mellom 0 og 9, inklusive"
 
-#: calendar/gui/calendar-summary.c:83
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:119 calendar/gui/calendar-summary.c:125
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:276
+#: calendar/gui/calendar-summary.c:302
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Feil under lasting av kalender</b>"
 
-#: calendar/gui/calendar-summary.c:281
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
-
-#: calendar/gui/calendar-summary.c:287
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke stЬttet"
 
-#: calendar/gui/calendar-summary.c:367
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Vis"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Vis tid for avtalers slutt"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Vis vedlegg"
+
+#: calendar/gui/calendar-summary.c:583
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm pЕ %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Melding om din avtale pЕ %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-msgid "Close"
-msgstr "Lukk"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Rediger avtale:"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Utsett-tid (minutter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "5 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minutter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Tidsavbrudd for alarm etter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip nЕr alarmvinduet kommer til syne."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Brukervalg for kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "KomprimИr helger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Forvalg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis alternativer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "SlЕ pЕ utsetting for "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "FЬrste dag i uken:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:438
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "MarkИr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "OppfЬringer som gЕr ut idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "OppfЬringer som gЕr ut i dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "OppfЬringer som ikke har gЕtt ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "OppfЬringer som ikke har gЕtt ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Man"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:434
-msgid "Monday"
-msgstr "Mandag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "UtgЕtte oppfЬringer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "UtgЕtte oppfЬringer:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Velg en farge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "PЕminnelse om alle avtaler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "PЕminnelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "LЬr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:439
-msgid "Saturday"
-msgstr "LЬrdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Vis tid for avtalers slutt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Vis ukenummer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagen starter:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "SЬn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:440
-msgid "Sunday"
-msgstr "SЬndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Oppgaveblokk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:437
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid fЬr den gЕr ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Oppdeling av tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:435
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:436
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbeidsuke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minutter i forveien."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "seconds."
-msgstr "sekunder"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker pЕ at du vil slette avtalen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker pЕ at du vil slette denne avtalen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker pЕ at du vil slette oppgaven `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker pЕ at du vil slette denne oppgaven uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker pЕ at du vil slette journaloppfЬringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker pЕ at du vil slette denne journaloppfЬringen uten tittel?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
-msgid "% Comp_lete:"
-msgstr "% ferdi_g:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-msgid "C_lassification:"
-msgstr "K_lassifisering"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Avbrutt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Completed"
-msgstr "FullfЬrt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "Date Completed:"
-msgstr "FullfЬrt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "High"
-msgstr "HЬy"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "In Progress"
-msgstr "Under arbeid"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "Low"
-msgstr "Lav"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: mail/mail-config-druid.glade.h:41 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "S_ummary"
-msgstr "Sa_mmendrag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Task"
-msgstr "Oppgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "_Due Date:"
-msgstr "Fer_dig-dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
 #: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "RedigИr oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "JournaloppfЬring - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "kategorier"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Klassifisering"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "FullfЬrt"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Slutt etter"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Sta_rt dato:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Merk oppgaven som fullfЬrt"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Sa_mmendrag"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Gjennomsiktig"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "еpne..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "еpne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Merk som fullfЬrt"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullfЬrt"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Slett"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "RedigИr denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:15
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "GjЬr denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfЬringen"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfЬringer"
 
-#: calendar/gui/e-itip-control.c:140
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kunne ikke oppdatere din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:147 calendar/gui/e-itip-control.c:489
-msgid "Component successfully updated."
-msgstr "Oppdatering av komponent fullfЬrt."
-
-#: calendar/gui/e-itip-control.c:154
-msgid "There was an error loading the calendar file."
-msgstr "Det oppsto en feil under lasting av kalenderfilen."
-
-#: calendar/gui/e-itip-control.c:178
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kunne ikke Еpne din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:437 calendar/gui/e-itip-control.c:508
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kunne ikke laste din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:449
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke lese din kalenderfil!\n"
-
-#: calendar/gui/e-itip-control.c:462
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra noen som ikke er invitert!"
-
-#: calendar/gui/e-itip-control.c:478
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke oppdatere ditt kalenderlager."
-
-#: calendar/gui/e-itip-control.c:519
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
-
-#: calendar/gui/e-itip-control.c:529
-msgid "Component successfully deleted."
-msgstr "Sletting av komponent fullfЬrt."
-
-#: calendar/gui/e-itip-control.c:673
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
-
-#: calendar/gui/e-itip-control.c:759
-msgid "Add to Calendar"
-msgstr "Legg til i kalenderen"
-
-#: calendar/gui/e-itip-control.c:793
-msgid "Accept"
-msgstr "AkseptИr"
-
-#: calendar/gui/e-itip-control.c:794
-msgid "Decline"
-msgstr "AvslЕ"
-
-#: calendar/gui/e-itip-control.c:795
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
-#: calendar/gui/e-itip-control.c:839
-msgid "Update Calendar"
-msgstr "OppdatИr kalender"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Cancel Meeting"
-msgstr "Alys mЬte"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"Kategorier: "
 
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:285
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i `%s'"
 
-#: calendar/gui/e-tasks.c:292
-#, c-format
-msgid "Could not create a tasks file in `%s'"
-msgstr "Kunne ikke opprette oppgavefil i `%s'"
-
-#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nЬdvendig for Е laste `%s' er ikke stЬttet"
@@ -2171,269 +1650,112 @@ msgstr "Metoden som er nЬdvendig for Е laste `%s' er ikke stЬttet"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "Grunnleggende om avtaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Classification"
-msgstr "Klassifisering"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Egendefinert gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dager"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Unntak"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Timer"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Send _til:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutter"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "Endre"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Ingen gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "ForhЕndsvis"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "Of_fentlig"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regel for gjenintreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "PЕminnelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Enkel gjeninntreffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Lyd"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "_Kontakter"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lutt-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_E-post"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "KjЬ_r program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dag(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "for"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "for alltid"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "pЕ"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etikett21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mЕned(er)"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Mandag"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "til"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Tirsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "uke(r)"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Onsdag"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "Еr"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Torsdag"
 
-#: calendar/gui/event-editor.c:330
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Fredag"
 
-#: calendar/gui/event-editor.c:408
-msgid "on"
-msgstr "pЕ"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "LЬrdag"
 
-#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "SЬndag"
 
-#: calendar/gui/event-editor.c:560
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:567
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:721
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:838
+#: 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:3092 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunne ikke laste kalenderen i `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunne ikke opprette kalender i `%s'"
-
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Desember"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "GЕ til dato"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "GЕ til idag"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Kan ikke Еpne mappe `%s':\n"
+"%s"
 
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "Januar"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "Metoden som er nЬdvendig for Е laste `%s' er ikke stЬttet"
 
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "Juli"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "SЬn"
 
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "Juni"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Man"
 
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "Mars"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tir"
 
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "Mai"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
 
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "November"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tor"
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "Oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "September"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "LЬr"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -2627,11 +1949,11 @@ msgstr "Dette Еret (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "ForhЕndsvisning av utskrift"
 
-#: calendar/gui/tasks-control.c:103
+#: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
@@ -2725,61 +2047,69 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s pЕ %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Avbrutt"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Tjener koblet fra."
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "еpne kalender"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' mЕ inneholde et brukernavn"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' mЕ inneholde et vertsnavn"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' mЕ inneholde en sti"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Ingen vert %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Midlertidig ute av stand til Е slЕ opp vertsnavn %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2788,17 +2118,17 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-streng `%s' inneholder ikke protokoll"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
@@ -2816,40 +2146,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar pЕ autentisering fra tjener."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2861,29 +2192,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post pЕ IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved Е bruke et "
 "klartekst-passord."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Dette lar deg koble til IMAP-tjeneren ved Е bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2894,30 +2225,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
 #: 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)"
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "UNIX e-postkataloger i MH-format"
 
 #: 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)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: 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)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
+msgstr "UNIX e-post filer i mbox-format"
 
 #: camel/providers/local/camel-local-provider.c:59
 msgid "For storing local mail in qmail maildir directories"
@@ -3255,8 +2588,8 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke Еpne eller opprette .newsrc-fil for %s: %s"
@@ -3288,7 +2621,7 @@ msgstr ""
 "e-post fra enkelte e-posttilbydere via web i tillegg til proprietФre "
 "e-postsystemer."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3297,7 +2630,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er stЬttet av mange "
 "POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3307,29 +2640,29 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv pЕ tjenere som hevder Е stЬtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lar deg koble til POP-tjeneren ved Е bruke Kerberos 4 som "
 "autentisering."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %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 "Kunne ikke koble til POP-tjener pЕ %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3338,12 +2671,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3351,7 +2684,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen stЬtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3360,13 +2693,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3416,25 +2748,21 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:53
-msgid "SMTP"
-msgstr "SMTP"
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "Ingen autentisering nЬdvendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -3442,108 +2770,107 @@ msgstr ""
 "Dette alternativet lar deg koble til SMTP-tjeneren uten bruk av "
 "autentisering. Dette bЬr fungere for de fleste SMTP-tjenerene."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:10
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Dette lar deg koble til SMTP-tjeneren ved Е bruke CRAM-MD5-autentisering."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-forespЬrsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"MAIL FROM\"-forespЬrsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Feil ved \"MAIL FROM\"-forespЬrsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for \"RCPT TO\"-forespЬrsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-forespЬrsel: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Feil ved DATA-svar: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Feil ved DATA-svar: meldingsterminering: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespЬrsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-forespЬrsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -3586,12 +2913,11 @@ msgid "attachment"
 msgstr "vedlegg"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Fjern"
 
@@ -3607,52 +2933,40 @@ msgstr "Legg til vedlegg..."
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-msgid "Attachment properties"
-msgstr "Egenskaper for vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:249
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Klikk her for Е fЕ opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du Ьnsker Е bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:310 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:316
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:322
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3660,11 +2974,11 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten Е komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
@@ -3677,38 +2991,38 @@ msgstr ""
 "Kunne ikke Еpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3718,27 +3032,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "еpne fil"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3746,26 +3060,22 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker pЕ at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "SЬ_k"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "Еr"
@@ -3898,7 +3208,7 @@ msgstr "innkommende"
 msgid "outgoing"
 msgstr "utgЕende"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "RedigИr filtre"
 
@@ -3999,186 +3309,167 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "RedigИr VFoldere"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Innkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "UtgЕende"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "vFolder kilder"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "etter"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "fЬr"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "KopiИr til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Dato sendt"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Uttrykk"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Videresend til adresse"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Meldingskropp"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Message was received"
+msgstr "Meldingen ble mottatt"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Message was sent"
+msgstr "Meldingen ble sendt"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "slutter med"
+msgid "Regex Match"
+msgstr "Treff pЕ vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "eksisterer"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Poenggi"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Uttrykk"
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "er"
+msgid "Source"
+msgstr "Kilde"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "er stЬrre enn"
+msgid "Specific header"
+msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "er mindre enn"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "er ikke"
+msgid "Stop Processing"
+msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Meldingskropp"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Meldingshode"
+msgid "after"
+msgstr "etter"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Meldingen ble mottatt"
+msgid "before"
+msgstr "fЬr"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Meldingen ble sendt"
+msgid "contains"
+msgstr "inneholder"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "pЕ eller etter"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "pЕ eller fЬr"
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr "Treff pЕ vanlig uttrykk"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Avsender"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "Sett status"
+msgid "is greater than"
+msgstr "er stЬrre enn"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "lyder som"
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Kilde"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "starter med"
+msgid "on or after"
+msgstr "pЕ eller etter"
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Status"
+msgid "on or before"
+msgstr "pЕ eller fЬr"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Emne"
+msgid "starts with"
+msgstr "starter med"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4196,10 +3487,6 @@ msgstr "Legg til regel"
 msgid "Edit Score Rule"
 msgstr "Rediger poengregel"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Poenggi"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Legg til regel for VFolder"
@@ -4208,204 +3495,165 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "RedigИr VFolder regel"
 
-#: mail/component-factory.c:280
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:83
-#: ui/evolution-message-composer.xml.h:14
-msgid "Save"
-msgstr "Lagre"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Velg mappe"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "FiltrИr etter emne"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "FiltrИr etter sender"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "FiltrИr etter mottaker"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "FiltrИr etter e-postliste"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Vis alle skjulte"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Skjul valgte"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Skjul leste"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Skjul slettede"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Skjul emne"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "Skjul fra sender"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:10
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "еpne"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "RedigИr"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:27
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:33
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "MarkИr som lest"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "KopiИr til mappe..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Angre slett"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "PЕfЬr filtre"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:5
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:16
-msgid "Hide Messages"
-msgstr "Skjul meldinger"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "FiltrИr etter e-postliste (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Skjul emne \"%s\""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "Skjul fra sender <%s>"
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktivt lagringsformat:"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "Format for postboks"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Forvalgt"
 
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nytt lagringsformat:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+#, fuzzy
+msgid "Evolution Account Manager"
+msgstr "HЕndtering av konti"
 
-#: mail/local-config.glade.h:4
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
-"Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
-"pЕ diskplass) ikke nЬdvendigvis rettes opp igjen. Vennligst bruk denne "
-"funksjonen med forsiktighet."
-
-#: mail/local-config.glade.h:5
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:6
-msgid "mbox"
-msgstr "mbox"
 
-#: mail/local-config.glade.h:7
-msgid "mh"
-msgstr "mh"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Evolution oppgaveliste-komponent"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4427,7 +3675,7 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:78
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4439,7 +3687,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nЕ?"
 
-#: mail/mail-callbacks.c:121
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4447,7 +3695,7 @@ msgstr ""
 "Du mЕ konfigurere en identitet\n"
 "fЬr du kan skrive e-post."
 
-#: mail/mail-callbacks.c:133
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4455,19 +3703,15 @@ msgstr ""
 "Du mЕ konfigurere en e-post-transport\n"
 "fЬr du kan skrive e-post."
 
-#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
-msgid "You have no mail sources configured"
-msgstr "Du har ikke konfigurert e-postkilder"
-
-#: mail/mail-callbacks.c:218
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Du har ikke konfigurert en utboks"
 
-#: mail/mail-callbacks.c:249
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4475,23 +3719,30 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Du mЕ konfigurere en identitet\n"
+"fЬr du kan skrive e-post."
+
+#: mail/mail-callbacks.c:365
 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:537
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "KopiИr melding(er) til"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4499,11 +3750,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4511,15 +3762,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:839
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:923
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4528,427 +3779,32 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:972
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-config-druid.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config-druid.glade.h:2
-msgid "Account Information"
-msgstr "Kontoinformasjon"
-
-#: mail/mail-config-druid.glade.h:3
-msgid "Account Management"
-msgstr "HЕndtering av konti"
-
-#: mail/mail-config-druid.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaper for konto"
-
-#: mail/mail-config-druid.glade.h:6
-msgid "Advanced"
-msgstr "Avansert"
-
-#: mail/mail-config-druid.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringstype:"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Gratulerer, konfigurasjon av e-post er fullfЬrt.\n"
-
-#: mail/mail-config-druid.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config-druid.glade.h:18
-msgid "Default"
-msgstr "Forvalgt"
-
-#: mail/mail-config-druid.glade.h:20
-msgid "Done"
-msgstr "Ferdig"
-
-#: mail/mail-config-druid.glade.h:21
-msgid "E-Mail Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-druid.glade.h:23
-msgid "Email Address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-post-konfigurasjon"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Full Name:"
-msgstr "Fullt navn:"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Hostname:"
-msgstr "Vertsnavn:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "E-posttjener for innkommende post"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "Keep mail on server"
-msgstr "Behold e-post pЕ tjener"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Mail Account"
-msgstr "E-post konto"
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "E-post-konfigurasjonsdruide"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Make this my default account"
-msgstr "Bruk denne som standard konto"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "News"
-msgstr "News"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Optional"
-msgstr "Valgfri"
-
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Outgoing Mail Server"
-msgstr "E-posttjener for utgЕende post"
-
-#: mail/mail-config-druid.glade.h:45
-msgid "Password:"
-msgstr "Passord:"
-
-#: mail/mail-config-druid.glade.h:47
-msgid "Plain Text"
-msgstr "Vanlig tekst"
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Receiving Email"
-msgstr "Mottar e-post"
-
-#: mail/mail-config-druid.glade.h:49
-msgid "Remember my password"
-msgstr "Husk mitt passord"
-
-#: mail/mail-config-druid.glade.h:50 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Reply-to:"
-msgstr "Svar-til:"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Required"
-msgstr "NЬdvendige"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Save password"
-msgstr "Lagre passord"
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Select signature file"
-msgstr "Velg signaturfil"
-
-#: mail/mail-config-druid.glade.h:56
-msgid "Sending Email"
-msgstr "Sender e-post"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Server Configuration"
-msgstr "Tjenerkonfigurasjon"
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Server Type: "
-msgstr "Tjenertype: "
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server requires authentication"
-msgstr "Tjener krever autentisering"
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Servers"
-msgstr "Tjenere"
-
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-druid.glade.h:63
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "This server requires a secure connection (SSL)"
-msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config-druid.glade.h:67
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
-"eller \"Hjemme\"."
-
-#: mail/mail-config-druid.glade.h:69
-msgid "User Information"
-msgstr "Brukerinformasjon"
-
-#: mail/mail-config-druid.glade.h:70 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: mail/mail-config-druid.glade.h:71
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"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 ""
-"Skriv inn ditt navn og din e-post adresse for bruk i utgЕende post. Du kan "
-"ogsЕ skrive inn navnet pЕ din organisasjon, og navnet pЕ en signaturfil."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Fullt navn:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-post adresse:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:14
-msgid "Signature File"
-msgstr "Signaturfil"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Tjener:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "SЬk etter stЬttede typer..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Ikke slett meldinger fra tjeneren"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "PrЬv ut innstillinger"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Type e-post-kilde:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:363
+#, c-format
 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."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"\n"
-"Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
-"typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Type news-kilde:"
-
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:629
+#, c-format
 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."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"\n"
-"Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
-"typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Type e-post-transport"
 
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
-"denne.\n"
-"Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
-"typer...\" knappen etter at du har skrevet inn resten av informasjonen."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Legg til identitet"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Rediger identitet"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Legg til kilde"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Rediger kilde"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Legg til news-tjener"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "RedigИr news-tjener"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Tester \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Test tilkobling til \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Tilkoblingen var vellykket!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "SpЬr etter autorisasjonsegenskaper for \"%s\""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "SpЬr etter autorisasjon hos \"%s\""
-
-#: mail/mail-config.glade.h:2
-msgid "Address"
-msgstr "Adresse"
-
-#: mail/mail-config.glade.h:5
-msgid "Identities"
-msgstr "Identiteter"
-
-#: mail/mail-config.glade.h:6
-msgid "Mail Sources"
-msgstr "E-post-kilder"
-
-#: mail/mail-config.glade.h:7
-msgid "Mail Transport"
-msgstr "E-post-transport"
-
-#: mail/mail-config.glade.h:8
-msgid "Mark message as seen [ms]: "
-msgstr "Merk melding som sett [ms]: "
-
-#: mail/mail-config.glade.h:9
-msgid "News Servers"
-msgstr "News-tjenere"
-
-#: mail/mail-config.glade.h:10
-msgid "News Sources"
-msgstr "News-kilder"
-
-#: mail/mail-config.glade.h:11
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: mail/mail-config.glade.h:13
-msgid "Send messages in HTML format"
-msgstr "Send meldinger i HTML-format"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Vennligst skriv inn din PGP/GPG passphrase."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Ingen passord gitt."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikke opprette rЬr til GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Ingen GPG/PGP-program tilgjengelig."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Kunne ikke opprette midlertidig fil: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -4986,65 +3842,65 @@ msgstr "еpne i %s..."
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Ingen GPG/PGP-stЬtte tilgjengelig i denne versjonen av Evolution."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Svar-til:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Kryptert melding ikke vist"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Kryptert melding"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Klikk pЕ ikonet for Е dekryptere."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, 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:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
@@ -5104,7 +3960,7 @@ msgstr "Registrerer lokal mappe"
 msgid "Register local folder"
 msgstr "RegistrИr lokal mappe"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5135,143 +3991,143 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:91
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:336
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post pЕ %s."
 
-#: mail/mail-ops.c:406
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fi_ltrИr e-post ved behov"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: mail/mail-ops.c:670
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Sender kЬ"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Send kЬ"
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:812
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:809 mail/mail-ops.c:815
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "KopiИr meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:936
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "KopiИrer"
 
-#: mail/mail-ops.c:959
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1165
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "еpner mappe %s"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "TЬmmer mappe"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Laster %s-mappe for %s"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Last %s-mappe for %s"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5280,12 +4136,12 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5407,111 +4263,190 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:890
 #, 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:896 mail/message-list.c:912
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr "I gЕr %l:%M %p"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Merket"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "vedlegg"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "Fra:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Ferdig-dato"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Dato mottatt"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Til:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "StЬrrelse:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Vennligst skriv inn din PGP/GPG passphrase."
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Vennligst skriv inn din PGP/GPG passphrase."
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Ingen GPG/PGP-program tilgjengelig."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Ingen passord gitt."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunne ikke opprette rЬr til GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikke opprette midlertidig fil: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Mapper"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Poenggi"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Vis mapper som som starter med:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Henter lager for \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Hent lager for \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sletter abonnement pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "AbonnИr pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Slett abonnement pЕ mappe \"%s\""
@@ -5621,23 +4556,24 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjЬres."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5647,7 +4583,7 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljЬet."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "GЕ til mappe..."
 
@@ -5655,13 +4591,18 @@ msgstr "GЕ til mappe..."
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5669,7 +4610,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5678,15 +4619,15 @@ msgstr ""
 "Ops! Visningen for `%s' dЬde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5695,51 +4636,61 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ikke fjern"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_SmЕ ikoner"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som smЕ ikoner"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Vis _snarveilinjen"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Vis _snarveilinjen"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktiver"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Aktiver denne snarveien"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
@@ -5747,12 +4698,11 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:43 ui/evolution.xml.h:29
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
@@ -5863,1198 +4813,2114 @@ msgstr "SlЕ av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create a new contact"
-msgstr "Opprett en ny kontakt"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "_Avtale"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slett en kontakt"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "MЬteforesp_Ьrsel"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-msgid "Find"
-msgstr "Finn"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "Send _melding"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Finn en kontakt"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:14
-msgid "New"
-msgstr "Ny"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "_Oppgave"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "Oppgavefo_respЬrsel"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "Stop"
-msgstr "Stopp"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "_JournaloppfЬring"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stopp innlesing"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "_Notis"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Vis alle"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "Velg skjema..."
+
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "_Notis-stil"
+
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "DefinИr utskrift_stiler"
+
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "_Send"
+
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "Lagre vedle_gg..."
+
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "_Flytt 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 "Sideoppsett"
+
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "ForhЕndsvisning av utskrift"
+
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "Lim inn _spesial..."
+
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
+msgstr "Merk som ulest"
+
+#: 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 "_OppfЬring"
+
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "_Ulest oppfЬring"
+
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FЬ_rste oppfЬring i mappe"
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "_Siste oppfЬ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 "_Tilpass..."
+
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Forri_ge"
+
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "Nes_te"
+
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Verk_tЬylinjer"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "_Fil..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "Opp_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 "_Avsnitt..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "_Utform dette skjemaet"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "U_tform et skjema..."
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "PublisИr skjema..."
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "Pu_blisИr skjema som..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FeilsЬking i skript"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "_Stavekontroll..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "Sk_jemaer"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Send _melding til kontakt..."
+
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Stavekontroll..."
+
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "_Kontakt"
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "_JournaloppfЬring"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "KopiИr til mappe..."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "Send _melding"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "Send _melding"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Videresend som v_Calendar"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfigurasjon av adressebok..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "_Videresend"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "S_kriv ut kontakter..."
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Sett _inn"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_SЬk etter kontakter"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormat"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
+#: ui/evolution-contact-editor.xml:171
 msgid "_Tools"
 msgstr "_VerktЬy"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dager"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Ha_ndlinger"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Endre brukervalg"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "Forrige"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "GЕ til forrige oppfЬring"
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "Brukervalg for kalender..."
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "Neste"
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "GЕ til neste oppfЬring"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Opprett en ny kalender"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Go back in time"
-msgstr "GЕ tilbake i tid"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Opptatt"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go forward in time"
-msgstr "GЕ fremover i tid"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Ute"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "GЕ til"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Ingen informasjon"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to a specific date"
-msgstr "GЕ til en spesifikk dato"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Inviter andre..."
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to present time"
-msgstr "GЕ til i dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Alternativer"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "MЕned"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Vis k_un arbeidstid"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-msgid "Next"
-msgstr "Neste"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Vis _zoomet ut"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "еpne en kalender"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Oppdater fri/ledig"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Forrige"
+#: 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 "_Autovelg"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
-msgstr "Skriv ut denne kalenderen"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Alle mennesker og ressurser"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Lagre kalender som noe annet"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle _mennesker og en ressurs"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Show 1 day"
-msgstr "Vis 1 dag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_NЬdvendige mennesker"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show 1 month"
-msgstr "Vis 1 mЕned"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "NЬdvendige mennesker _og en ressurs"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show 1 week"
-msgstr "Vis 1 uke"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Tid for mЬtets _start:"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show the working week"
-msgstr "Vis arbeidsuken"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Tid for mЬtets slutt:"
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle deltakere"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MTWTFSS"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "nЕ"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Uke"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:26
-msgid "_New"
-msgstr "_Ny"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_еpne kalender"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "SЬ_k"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "S_kriv ut denne kalenderen"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"
 
-#: ui/evolution-calendar.xml.h:30
-msgid "_Save As..."
-msgstr "Lagre _som..."
+#~ msgid "Delete Contact?"
+#~ msgstr "Slett kontakt?"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Slett denne oppfЬringen"
+#~ msgid "Address _2:"
+#~ msgstr "Adresse _2:"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Slett..."
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Hjelp"
+#~ msgid "Check Address"
+#~ msgstr "Sjekk adresse"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv ut konvolutt..."
+#~ msgid "Countr_y:"
+#~ msgstr "Lan_d:"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-msgid "Print this item"
-msgstr "Skriv ut denne oppfЬringen"
+#~ msgid "Finland"
+#~ msgstr "Finland"
 
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-msgid "Print..."
-msgstr "Skriv ut..."
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-msgid "Save _As..."
-msgstr "L_agre som..."
+#~ msgid "_Address:"
+#~ msgstr "_Adresse:"
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-msgid "Save and Close"
-msgstr "Lagre og lukk"
+#~ msgid "_City:"
+#~ msgstr "_By:"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Lagre kontakten og lukk dialogboksen"
+#~ msgid "_PO Box:"
+#~ msgstr "_Postboks:"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Se_nd kontakt til andre..."
+#~ msgid "_State/Province:"
+#~ msgstr "_Stat/Provins:"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-msgid "See online help"
-msgstr "Se hjelp"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_ZIP/Postnummer:"
 
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Send _melding til kontakt..."
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressebok-kilder"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:37 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:20
-msgid "_File"
-msgstr "_Fil"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "S_kriv ut..."
+#~ msgid "Find..."
+#~ msgstr "Finn..."
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Save"
-msgstr "_Lagre"
+#~ msgid "Message Recipients"
+#~ msgstr "Meldingsmottakere:"
 
-#: ui/evolution-event-editor.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikasjonen"
+#~ msgid "Select Names"
+#~ msgstr "Velg navn"
 
-#: ui/evolution-event-editor.xml.h:2
-msgid "About..."
-msgstr "Om..."
+#~ msgid "Select name from:"
+#~ msgstr "Velg navn fra:"
 
-#: ui/evolution-event-editor.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-event-editor.xml.h:4
-msgid "C_lear"
-msgstr "T_Ьm"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-event-editor.xml.h:5
-msgid "C_ut"
-msgstr "Klipp _ut"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-event-editor.xml.h:6
-msgid "Clear"
-msgstr "TЬm"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "Clear the selection"
-msgstr "TЬm utvalget"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Lukk denne avtalen"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-msgid "Copy"
-msgstr "KopiИr"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Copy the selection"
-msgstr "KopiИr utvalget"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Cut"
-msgstr "Klipp ut"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:13
-msgid "Cut the selection"
-msgstr "Klipp ut utvalget"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Dump XML"
-msgstr "Dump XML"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse av grensesnittet som XML"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "Addresse_bok..."
+#~ msgid "l"
+#~ msgstr "l"
 
-#: ui/evolution-event-editor.xml.h:19
-msgid "FIXME: Ch_oose Form..."
-msgstr "Velg skjema..."
+#~ msgid "m"
+#~ msgstr "m"
 
-#: ui/evolution-event-editor.xml.h:20
-msgid "FIXME: Chec_k Names"
-msgstr "Sjek_k navn"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "FIXME: Cop_y to Folder..."
-msgstr "KopiИr til mappe..."
+#~ msgid "o"
+#~ msgstr "o"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "FIXME: D_esign a Form..."
-msgstr "U_tform et skjema..."
+#~ msgid "p"
+#~ msgstr "p"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Define Print _Styles"
-msgstr "DefinИr utskrift_stiler"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Desi_gn This Form"
-msgstr "_Utform dette skjemaet"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FЬ_rste oppfЬring i mappe"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: For_ward"
-msgstr "_Videresend"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "Videresend som v_Calendar"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Help"
-msgstr "Hjelp"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "U_komplett oppgave"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "Sett inn fil"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "Opp_fЬring"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Paste _Special... "
-msgstr "Lim inn _spesial..."
+#~ msgid "z"
+#~ msgstr "z"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Print Pre_view"
-msgstr "ForhЕndsvisning av utskrift"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: Pu_blish Form As..."
-msgstr "Pu_blisИr skjema som..."
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Publish _Form..."
-msgstr "PublisИr skjema..."
+#~ msgid "Blank forms at end:"
+#~ msgstr "Blanke skjema pЕ slutten:"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: Rec_urrence..."
-msgstr "Gjentakelse..."
+#~ msgid "Body"
+#~ msgstr "Kropp"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: S_end"
-msgstr "_Send"
+#~ msgid "Bottom:"
+#~ msgstr "Bunn:"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Save Attac_hments..."
-msgstr "Lagre vedle_gg..."
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensjoner:"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Script _Debugger"
-msgstr "FeilsЬking i skript"
+#~ msgid "Font..."
+#~ msgstr "Skrifttype..."
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Task _Request"
-msgstr "Oppgavefo_respЬrsel"
+#~ msgid "Fonts"
+#~ msgstr "Skrifttyper"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
+#~ msgid "Footer:"
+#~ msgstr "Bunntekst:"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: _Customize..."
-msgstr "_Tilpass..."
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: _File..."
-msgstr "_Fil..."
+#~ msgid "Header"
+#~ msgstr "Topptekst"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: _Font..."
-msgstr "FIXME: Skri_fttyper..."
+#~ msgid "Header/Footer"
+#~ msgstr "Topp-/bunntekst"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: _Formatting"
-msgstr "_Formatering"
+#~ msgid "Headings"
+#~ msgstr "Topptekster"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Item"
-msgstr "_OppfЬring"
+#~ msgid "Headings for each letter"
+#~ msgstr "Topptekst for hver bokstav"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Journal Entry"
-msgstr "_JournaloppfЬring"
+#~ msgid "Height:"
+#~ msgstr "HЬyde:"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _Last Item in Folder"
-msgstr "_Siste oppfЬring i mappe"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Rett etter hverandre"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Mail Message"
-msgstr "Send _melding"
+#~ msgid "Include:"
+#~ msgstr "Inkluder:"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Memo Style"
-msgstr "_Notis-stil"
+#~ msgid "Landscape"
+#~ msgstr "Landskap"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Move to Folder..."
-msgstr "_Flytt til mappe..."
+#~ msgid "Left:"
+#~ msgstr "Venstre:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "_Ny avtale"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Bokstavfaner pЕ siden"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "_Notis"
+#~ msgid "Margins"
+#~ msgstr "Marger"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Object..."
-msgstr "_Objekt..."
+#~ msgid "Number of columns:"
+#~ msgstr "Antall kolonner:"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Paragraph..."
-msgstr "_Avsnitt..."
+#~ msgid "Options"
+#~ msgstr "Alternativer"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Spelling..."
-msgstr "_Stavekontroll..."
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _Standard"
-msgstr "_Standard"
+#~ msgid "Page"
+#~ msgstr "Side"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Task"
-msgstr "_Oppgave"
+#~ msgid "Page Setup:"
+#~ msgstr "Sideoppsett"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Unread Item"
-msgstr "_Ulest oppfЬring"
+#~ msgid "Paper"
+#~ msgstr "Papir"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: what goes here?"
-msgstr "Hva gЕr her?"
+#~ msgid "Paper source:"
+#~ msgstr "Papirkilde:"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
-msgstr "F_ormat"
+#~ msgid "Portrait"
+#~ msgstr "Portrett"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "Find Again"
-msgstr "Finn igjen"
+#~ msgid "Preview:"
+#~ msgstr "ForhЕndsvis:"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "Find _Again"
-msgstr "Finn ig_jen"
+#~ msgid "Print using gray shading"
+#~ msgstr "Skriv ut med grЕtoner"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "Go to the next item"
-msgstr "GЕ til neste oppfЬring"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Motsatt pЕ like sider"
 
-#: ui/evolution-event-editor.xml.h:66
-msgid "Go to the previous item"
-msgstr "GЕ til forrige oppfЬring"
+#~ msgid "Right:"
+#~ msgstr "HЬyre:"
 
-#: ui/evolution-event-editor.xml.h:67
-msgid "Modify the file's properties"
-msgstr "Endre filens egenskaper"
+#~ msgid "Sections:"
+#~ msgstr "Seksjoner:"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "N_ext"
-msgstr "N_este"
+#~ msgid "Shading"
+#~ msgstr "Skyggelegging"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Paste"
-msgstr "Lim inn"
+#~ msgid "Start on a new page"
+#~ msgstr "Start pЕ en ny side"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavlen"
+#~ msgid "Style name:"
+#~ msgstr "Stilnavn:"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Pre_vious"
-msgstr "Forri_ge"
+#~ msgid "Top:"
+#~ msgstr "Topp:"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "Previous"
-msgstr "Forrige"
+#~ msgid "Type:"
+#~ msgstr "Type:"
 
-#: ui/evolution-event-editor.xml.h:74
-msgid "Print S_etup..."
-msgstr "Skriveropps_ett..."
+#~ msgid "Width:"
+#~ msgstr "Bredde:"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Print Setup"
-msgstr "Skriveroppsett"
+#~ msgid "label26"
+#~ msgstr "etikett26"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Properties"
-msgstr "Egenskaper"
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Eksempel pЕ Bonobo-kontroll som viser en kalender."
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Redo"
-msgstr "Gjenopprett"
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Factory for eksempelkontroll for kalender"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Redo the undone action"
-msgstr "Gjenopprett angret handling"
+#~ msgid "Calendar Repository"
+#~ msgstr "Kalenderlager"
 
-#: ui/evolution-event-editor.xml.h:81
-msgid "Replace"
-msgstr "Erstatt"
+#~ msgid "Calendar Server"
+#~ msgstr "Kalendertjener"
 
-#: ui/evolution-event-editor.xml.h:82
-msgid "Replace a string"
-msgstr "Erstattt en streng"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution komponent for kalendersammendrag."
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Lagre avtalen og lukk dialogboksen"
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution kalender iTip/iMip-visning"
 
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:19
-msgid "Save the current file"
-msgstr "Lagre aktiv fil"
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponent for hЕndtering av kalenderen."
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
-msgstr "Sett opp mЬte"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Factory for kalenderens sammendragskomponent."
 
-#: ui/evolution-event-editor.xml.h:89
-msgid "Schedule _Meeting"
-msgstr "Sett opp _mЬte"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Factory for Evolution kalender-komponent."
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Sett opp ett eller annet mЬte"
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Factory for kalenderens iTip visningskontroll"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Search again for the same string"
-msgstr "SЬk etter samme streng pЕ nytt"
+#~ msgid "<b>Error loading calendar:<br>Calendar in use."
+#~ msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
 
-#: ui/evolution-event-editor.xml.h:92
-msgid "Search for a string"
-msgstr "SЬk etter en streng"
+#~ msgid "Edit appointment"
+#~ msgstr "Rediger avtale:"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Select All"
-msgstr "Velg alle"
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Utsett-tid (minutter)"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Select everything"
-msgstr "Velg alt"
+#~ msgid "05 minutes"
+#~ msgstr "5 minutter"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Setup the page settings for your current printer"
-msgstr "RedigИr sideinnstillinger for aktiv skriver"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutter"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Undo"
-msgstr "Angre"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 timer (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:98
-msgid "Undo the last action"
-msgstr "Angre siste handling"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutter"
 
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:33
-msgid "_About..."
-msgstr "_Om..."
+#~ msgid "24 hour"
+#~ msgstr "24 timer"
 
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:34
-msgid "_Close"
-msgstr "L_ukk"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutter"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "_Copy"
-msgstr "_KopiИr"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutter"
 
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:35
-msgid "_Debug"
-msgstr "_FeilsЬk"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Tidsavbrudd for alarm etter"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:19
-msgid "_Edit"
-msgstr "R_edigИr"
+#~ msgid "Audio Alarms"
+#~ msgstr "Lyd-alarmer"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Find..."
-msgstr "_Finn..."
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pip nЕr alarmvinduet kommer til syne."
 
-#: ui/evolution-event-editor.xml.h:107
-msgid "_Forms"
-msgstr "Sk_jemaer"
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:38
-#: ui/evolution.xml.h:23
-msgid "_Help"
-msgstr "_Hjelp"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Brukervalg for kalender"
 
-#: ui/evolution-event-editor.xml.h:109
-msgid "_Insert"
-msgstr "Sett _inn"
+#~ msgid "Colors"
+#~ msgstr "Farger"
 
-#: ui/evolution-event-editor.xml.h:110
-msgid "_Object"
-msgstr "_Objekt"
+#~ msgid "Compress weekends"
+#~ msgstr "KomprimИr helger"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Paste"
-msgstr "_Lim inn"
+#~ msgid "Date navigator options"
+#~ msgstr "Alternativer for datonavigator"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Print"
-msgstr "S_kriv ut"
+#~ msgid "Defaults"
+#~ msgstr "Forvalg"
 
-#: ui/evolution-event-editor.xml.h:113
-msgid "_Properties..."
-msgstr "Egenska_per..."
+#~ msgid "Display options"
+#~ msgstr "Vis alternativer"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Redo"
-msgstr "Gjenopp_rett"
+#~ msgid "Enable snoozing for"
+#~ msgstr "SlЕ pЕ utsetting for "
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Replace..."
-msgstr "E_rstatt..."
+#~ msgid "End of day:"
+#~ msgstr "Dagen slutter:"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Toolbars"
-msgstr "Verk_tЬylinjer"
+#~ msgid "First day of week:"
+#~ msgstr "FЬrste dag i uken:"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Undo"
-msgstr "_Angre"
+#~ msgid "Highlight"
+#~ msgstr "MarkИr"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "KomponИr"
+#~ msgid "Items Due Today"
+#~ msgstr "OppfЬringer som gЕr ut idag"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "KomponИr en ny melding"
+#~ msgid "Items Due Today:"
+#~ msgstr "OppfЬringer som gЕr ut i dag:"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "KopiИr meldingen til en ny mappe"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "OppfЬringer som ikke har gЕtt ut"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "M_appe"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "OppfЬringer som ikke har gЕtt ut:"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrИr etter sender"
+#~ msgid "Overdue Items"
+#~ msgstr "UtgЕtte oppfЬringer"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "F_iltrИr etter mottaker"
+#~ msgid "Overdue Items:"
+#~ msgstr "UtgЕtte oppfЬringer:"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Glem _passord"
+#~ msgid "Pick a color"
+#~ msgstr "Velg en farge"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent e-post"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "PЕminnelse om alle avtaler"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted messages"
-msgstr "Skjul slette_de meldinger"
+#~ msgid "Reminders"
+#~ msgstr "PЕminnelser"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul le_ste meldinger"
+#~ msgid "Show"
+#~ msgstr "Vis"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide _Selected messages"
-msgstr "_Skjul valgte meldinger"
+#~ msgid "Show week numbers"
+#~ msgstr "Vis ukenummer"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
+#~ msgid "Start of day:"
+#~ msgstr "Dagen starter:"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Manage Subscriptions..."
-msgstr "HЕndtИr abonnement..."
+#~ msgid "TaskPad"
+#~ msgstr "Oppgaveblokk"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mar_k As Read"
-msgstr "Mar_kИr som lest"
+#~ msgid "Time Until Due"
+#~ msgstr "Tid fЬr den gЕr ut"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mark As U_nread"
-msgstr "Merk som _ulest"
+#~ msgid "Time divisions:"
+#~ msgstr "Oppdeling av tid:"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move"
-msgstr "Flytt"
+#~ msgid "Time format:"
+#~ msgstr "Tidformat:"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Move message to a new folder"
-msgstr "Flytt meldingen til en ny mappe"
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Previews the message to be printed"
-msgstr "Viser forhЕndsvisning av meldingen som skal skrives ut"
+#~ msgid "Work week"
+#~ msgstr "Arbeidsuke"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print Preview of message..."
-msgstr "Vis forhЕndsvisning av melding..."
+#~ msgid "minutes before they occur."
+#~ msgstr "minutter i forveien."
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message to the printer"
-msgstr "Skriv ut denne meldingen pЕ skriveren"
+#~ msgid "seconds."
+#~ msgstr "sekunder"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Print message..."
-msgstr "Skriv ut melding..."
+#~ msgid "% Comp_lete:"
+#~ msgstr "% ferdi_g:"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+#~ msgid "C_lassification:"
+#~ msgstr "K_lassifisering"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Reply to _Sender"
-msgstr "Svar til _sender"
+#~ msgid "Date Completed:"
+#~ msgstr "FullfЬrt dato:"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Velg _alle"
+#~ msgid "High"
+#~ msgstr "HЬy"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send kЬlagt e-post og hent ny e-post"
+#~ msgid "In Progress"
+#~ msgstr "Under arbeid"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All messages"
-msgstr "Vis _alle meldinger"
+#~ msgid "Low"
+#~ msgstr "Lav"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Threaded Message list"
-msgstr "Meldingsliste med trЕder"
+#~ msgid "Normal"
+#~ msgstr "Normal"
 
-#: ui/evolution-mail.xml.h:42
-msgid "VFolder on Se_nder"
-msgstr "VFolder for se_nder"
+#~ msgid "Not Started"
+#~ msgstr "Ikke startet"
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on _Recipients"
-msgstr "VFolder for mottake_re"
+#~ msgid "Task"
+#~ msgstr "Oppgave"
 
-#: ui/evolution-mail.xml.h:44
-msgid "View Raw Message Source"
-msgstr "Vis rЕ meldingskode"
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontakter..."
 
-#: ui/evolution-mail.xml.h:45
-msgid "_Apply Filters"
-msgstr "_PЕfЬr filtre"
+#~ msgid "_Due Date:"
+#~ msgstr "Fer_dig-dato:"
 
-#: ui/evolution-mail.xml.h:46
-msgid "_Configure Folder"
-msgstr "_KonfigurИr mappe"
+#~ msgid "_Priority:"
+#~ msgstr "_Prioritet:"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Copy to Folder..."
-msgstr "_KopiИr til mappe..."
+#~ msgid "_Status:"
+#~ msgstr "_Status:"
 
-#: ui/evolution-mail.xml.h:49
-msgid "_Edit Message"
-msgstr "R_edigИr melding"
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Expunge"
-msgstr "_TЬm"
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "Kunne ikke oppdatere din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Filter on Subject"
-msgstr "_FiltrИr etter emne"
+#~ msgid "Component successfully updated."
+#~ msgstr "Oppdatering av komponent fullfЬrt."
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Forward"
-msgstr "_Videresend"
+#~ msgid "There was an error loading the calendar file."
+#~ msgstr "Det oppsto en feil under lasting av kalenderfilen."
 
-#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Re_versИr utvalg"
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "Kunne ikke Еpne din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Kunne ikke laste din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Message"
-msgstr "_Melding"
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Kunne ikke lese din kalenderfil!\n"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Move to Folder..."
-msgstr "F_lytt til mappe..."
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dette er et svar fra noen som ikke er invitert!"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Open in New Window"
-msgstr "_еpne i nytt vindu"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kunne ikke oppdatere ditt kalenderlager."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Print Message"
-msgstr "S_kriv ut melding"
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Kunne ikke slette kalenderkomponenten!\n"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Save Message As..."
-msgstr "Lagre melding _som..."
+#~ msgid "Component successfully deleted."
+#~ msgstr "Sletting av komponent fullfЬrt."
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Source"
-msgstr "_Kildekode"
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "Med _trЕder"
+#~ msgid "Add to Calendar"
+#~ msgstr "Legg til i kalenderen"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "A_ngre slett"
+#~ msgid "Accept"
+#~ msgstr "AkseptИr"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VFolder for emne"
+#~ msgid "Decline"
+#~ msgstr "AvslЕ"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
+#~ msgid "Update Calendar"
+#~ msgstr "OppdatИr kalender"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
+#~ msgid "Cancel Meeting"
+#~ msgstr "Alys mЬte"
 
-#: ui/evolution-message-composer.xml.h:4
-msgid "Close the current file"
-msgstr "Lukk aktiv fil"
+#~ msgid "Could not create a tasks file in `%s'"
+#~ msgstr "Kunne ikke opprette oppgavefil i `%s'"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "KryptИr denne meldingen med PGP"
+#~ msgid "A_ll day event"
+#~ msgstr "Varer he_le dagen"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Appointment Basics"
+#~ msgstr "Grunnleggende om avtaler"
 
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Sett inn en tekstfil i meldingen"
+#~ msgid "Custom recurrence"
+#~ msgstr "Egendefinert gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Sett inn tekstfil..."
+#~ msgid "Days"
+#~ msgstr "Dager"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "еpne en fil"
+#~ msgid "Every"
+#~ msgstr "Hver"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "KryptИr med PGP"
+#~ msgid "Exceptions"
+#~ msgstr "Unntak"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "SignИr med PGP"
+#~ msgid "Hours"
+#~ msgstr "Timer"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Lagre som"
+#~ msgid "Mail _to:"
+#~ msgstr "Send _til:"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save in _folder... (FIXME)"
-msgstr "Lagre i _mappe..."
+#~ msgid "Minutes"
+#~ msgstr "Minutter"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in folder..."
-msgstr "Lagre i mappe..."
+#~ msgid "Modify"
+#~ msgstr "Endre"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save the current file with a different name"
-msgstr "Lagre aktiv fil med et nytt navn"
+#~ msgid "No recurrence"
+#~ msgstr "Ingen gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the message in a specified folder"
-msgstr "Lagre meldingen i en spesifisert mappe"
+#~ msgid "Preview"
+#~ msgstr "ForhЕndsvis"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Send"
-msgstr "Send"
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send _Later"
-msgstr "Send se_nere"
+#~ msgid "Pu_blic"
+#~ msgstr "Of_fentlig"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _later"
-msgstr "Send se_nere"
+#~ msgid "Recurrence"
+#~ msgstr "Gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send the mail in HTML format"
-msgstr "Send meldingen i HTML-format"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for gjenintreffelse"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the message later"
-msgstr "Send meldingen senere"
+#~ msgid "Reminder"
+#~ msgstr "PЕminnelse"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message now"
-msgstr "Send meldingen nЕ"
+#~ msgid "Simple recurrence"
+#~ msgstr "Enkel gjeninntreffelse"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send this message now"
-msgstr "Send denne meldingen nЕ"
+#~ msgid "Su_mmary:"
+#~ msgstr "Sa_mmendrag:"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show / hide attachments"
-msgstr "Vis/skjul vedlegg"
+#~ msgid "Time"
+#~ msgstr "Tid"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show _attachments"
-msgstr "Vis _vedlegg"
+#~ msgid "_Audio"
+#~ msgstr "_Lyd"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show attachments"
-msgstr "Vis vedlegg"
+#~ msgid "_Confidential"
+#~ msgstr "_Konfidensiell"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Sign this message with your PGP key"
-msgstr "SignИr denne meldingen med din PGP-nЬkkel"
+#~ msgid "_Contacts"
+#~ msgstr "_Kontakter"
 
-#: ui/evolution-message-composer.xml.h:39
-msgid "_Insert text file... (FIXME)"
-msgstr "Sett _inn tekstfil..."
+#~ msgid "_End time:"
+#~ msgstr "S_lutt-tid:"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Open..."
-msgstr "_еpne..."
+#~ msgid "_Mail"
+#~ msgstr "_E-post"
 
-#: ui/evolution-message-composer.xml.h:42
-msgid "_Security"
-msgstr "_Sikkerhet"
+#~ msgid "_Program"
+#~ msgstr "_Program"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Legg til mappe pЕ listen over abonnerte mapper"
+#~ msgid "_Run program:"
+#~ msgstr "KjЬ_r program:"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Les listen pЕ nytt"
+#~ msgid "_Start time:"
+#~ msgstr "_Start-tid:"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Les mappelisten pЕ nytt"
+#~ msgid "_Starting date:"
+#~ msgstr "_Start dato:"
 
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Fjern mappe fra din liste over abbonerte mapper"
+#~ msgid "day(s)"
+#~ msgstr "dag(er)"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "AbonnИr"
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "Fjern abonnement"
+#~ msgid "for"
+#~ msgstr "for"
 
-#: ui/evolution.xml.h:1
-msgid "Display a different folder"
-msgstr "Vis en annen mappe"
+#~ msgid "forever"
+#~ msgstr "for alltid"
 
-#: ui/evolution.xml.h:2
-msgid "E_xit"
-msgstr "A_vslutt"
+#~ msgid "label21"
+#~ msgstr "etikett21"
 
-#: ui/evolution.xml.h:3
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-linje _snarvei"
+#~ msgid "month(s)"
+#~ msgstr "mЕned(er)"
 
-#: ui/evolution.xml.h:4
-msgid "Exit the program"
-msgstr "Avslutt programmet"
+#~ msgid "until"
+#~ msgstr "til"
 
-#: ui/evolution.xml.h:5
-msgid "Getting _Started"
-msgstr "Kom _igang"
+#~ msgid "week(s)"
+#~ msgstr "uke(r)"
 
-#: ui/evolution.xml.h:6
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
+#~ msgid "year(s)"
+#~ msgstr "Еr"
 
-#: ui/evolution.xml.h:7
-msgid "Show the _Folder Bar"
-msgstr "Vis _mappelinjen"
+#~ msgid "Could not load the calendar in `%s'"
+#~ msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: ui/evolution.xml.h:8
-msgid "Show the _Shortcut Bar"
-msgstr "Vis _snarveilinjen"
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: ui/evolution.xml.h:9
-msgid "Submit _Bug Report"
-msgstr "Sen_d inn feilrapport"
+#~ msgid "April"
+#~ msgstr "April"
 
-#: ui/evolution.xml.h:10
-msgid "Submit bug report using Bug Buddy."
-msgstr "Send inn feilrapport ved bruk av Bug Buddy."
+#~ msgid "August"
+#~ msgstr "August"
 
-#: ui/evolution.xml.h:11
-msgid "Toggle whether to show the folder bar"
-msgstr "SlЕ av/pЕ visning av mappelinjen"
+#~ msgid "December"
+#~ msgstr "Desember"
 
-#: ui/evolution.xml.h:12
-msgid "Toggle whether to show the shortcut bar"
-msgstr "SlЕ av/pЕ visning av snarveilinjen"
+#~ msgid "February"
+#~ msgstr "Februar"
 
-#: ui/evolution.xml.h:13
-msgid "Using the C_ontact Manager"
-msgstr "Bruk av k_ontaktdatabasen"
+#~ msgid "Go To Date"
+#~ msgstr "GЕ til dato"
 
-#: ui/evolution.xml.h:14
-msgid "Using the _Calendar"
-msgstr "Bruk av _kalenderen"
+#~ msgid "Go To Today"
+#~ msgstr "GЕ til idag"
 
-#: ui/evolution.xml.h:15
-msgid "Using the _Mailer"
-msgstr "Bruk av e-_postprogrammet"
+#~ msgid "January"
+#~ msgstr "Januar"
 
-#: ui/evolution.xml.h:16
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
+#~ msgid "July"
+#~ msgstr "Juli"
 
-#: ui/evolution.xml.h:17
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
+#~ msgid "June"
+#~ msgstr "Juni"
 
-#: ui/evolution.xml.h:18
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
+#~ msgid "March"
+#~ msgstr "Mars"
 
-#: ui/evolution.xml.h:21
-msgid "_Folder"
-msgstr "_Mappe"
+#~ msgid "May"
+#~ msgstr "Mai"
 
-#: ui/evolution.xml.h:22
-msgid "_Go to Folder..."
-msgstr "_GЕ til mappe..."
+#~ msgid "November"
+#~ msgstr "November"
 
-#: ui/evolution.xml.h:24
-msgid "_Index"
-msgstr "_Indeks"
+#~ msgid "October"
+#~ msgstr "Oktober"
 
-#: ui/evolution.xml.h:25
-msgid "_Mail message (FIXME)"
-msgstr "Send _melding"
+#~ msgid "September"
+#~ msgstr "September"
 
-#: ui/evolution.xml.h:27
-msgid "_Settings"
-msgstr "Inn_stillinger"
+#~ msgid "Server disconnected."
+#~ msgstr "Tjener koblet fra."
 
-#: ui/evolution.xml.h:28
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
+#~ msgid "UNIX MH-format mail directories (CamelLocal version)"
+#~ msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#~ msgid "UNIX mbox-format mail files (CamelLocal version)"
+#~ msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Opptatt"
+#~ msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#~ msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ute"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen informasjon"
+#~ msgid "Attachment properties"
+#~ msgstr "Egenskaper for vedlegg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Inviter andre..."
+#~ msgid "File name:"
+#~ msgstr "Filnavn:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
+#~ msgid "MIME type:"
+#~ msgstr "MIME-type:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbeidstid"
+#~ msgid "Edit VFolders"
+#~ msgstr "RedigИr VFoldere"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ut"
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregler"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Oppdater fri/ledig"
+#~ msgid "Incoming"
+#~ msgstr "Innkommende"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Outgoing"
+#~ msgstr "UtgЕende"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Autovelg"
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuelle mapper"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "vFolder Sources"
+#~ msgstr "vFolder kilder"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og ressurser"
+#~ msgid "Save"
+#~ msgstr "Lagre"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en ressurs"
+#~ msgid "Show all hidden"
+#~ msgstr "Vis alle skjulte"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_NЬdvendige mennesker"
+#~ msgid "Hide selected"
+#~ msgstr "Skjul valgte"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "NЬdvendige mennesker _og en ressurs"
+#~ msgid "Hide read"
+#~ msgstr "Skjul leste"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for mЬtets _start:"
+#~ msgid "Hide deleted"
+#~ msgstr "Skjul slettede"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for mЬtets slutt:"
+#~ msgid "Hide Subject"
+#~ msgstr "Skjul emne"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltakere"
+#~ msgid "Hide from Sender"
+#~ msgstr "Skjul fra sender"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
+#~ msgid "Hide Messages"
+#~ msgstr "Skjul meldinger"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Skjul emne \"%s\""
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "Skjul fra sender <%s>"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "nЕ"
+#~ msgid "Current store format:"
+#~ msgstr "Aktivt lagringsformat:"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Mailbox Format"
+#~ msgstr "Format for postboks"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "New store format:"
+#~ msgstr "Nytt lagringsformat:"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure (such as lack of "
+#~ "disk space) may not be automatically recoverable.  Please use this feature "
+#~ "with care."
+#~ msgstr ""
+#~ "Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
+#~ "pЕ diskplass) ikke nЬdvendigvis rettes opp igjen. Vennligst bruk denne "
+#~ "funksjonen med forsiktighet."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Du har ikke konfigurert e-postkilder"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontoinformasjon"
+
+#~ msgid "Account Properties"
+#~ msgstr "Egenskaper for konto"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentiseringstype:"
+
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Gratulerer, konfigurasjon av e-post er fullfЬrt.\n"
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution e-post-konfigurasjon"
+
+#~ msgid "Full Name:"
+#~ msgstr "Fullt navn:"
+
+#~ msgid "Hostname:"
+#~ msgstr "Vertsnavn:"
+
+#~ msgid "Identity"
+#~ msgstr "Identitet"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "E-posttjener for innkommende post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Behold e-post pЕ tjener"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "E-post konto"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "E-post-konfigurasjon"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "E-post-konfigurasjonsdruide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Bruk denne som standard konto"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskjellig"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Optional"
+#~ msgstr "Valgfri"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisasjon:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "E-posttjener for utgЕende post"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig tekst"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Mottar e-post"
+
+#~ msgid "Remember my password"
+#~ msgstr "Husk mitt passord"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Svar-til:"
+
+#~ msgid "Required"
+#~ msgstr "NЬdvendige"
+
+#~ msgid "Save password"
+#~ msgstr "Lagre passord"
+
+#~ msgid "Select signature file"
+#~ msgstr "Velg signaturfil"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sender e-post"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Tjenerkonfigurasjon"
+
+#~ msgid "Server Type: "
+#~ msgstr "Tjenertype: "
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Tjener krever autentisering"
+
+#~ msgid "Servers"
+#~ msgstr "Tjenere"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
+#~ "eller \"Hjemme\"."
+
+#~ msgid "User Information"
+#~ msgstr "Brukerinformasjon"
+
+#~ msgid "Username:"
+#~ msgstr "Brukernavn:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
+
+#~ 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 ""
+#~ "Skriv inn ditt navn og din e-post adresse for bruk i utgЕende post. Du kan "
+#~ "ogsЕ skrive inn navnet pЕ din organisasjon, og navnet pЕ en signaturfil."
+
+#~ msgid "Full name:"
+#~ msgstr "Fullt navn:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-post adresse:"
+
+#~ msgid "Signature File"
+#~ msgstr "Signaturfil"
+
+#~ msgid "Server:"
+#~ msgstr "Tjener:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "SЬk etter stЬttede typer..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Ikke slett meldinger fra tjeneren"
+
+#~ msgid "Test Settings"
+#~ msgstr "PrЬv ut innstillinger"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Type e-post-kilde:"
+
+#~ 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 ""
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "News source type:"
+#~ msgstr "Type news-kilde:"
+
+#~ 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 ""
+#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Type e-post-transport"
+
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
+
+#~ msgid "Add Identity"
+#~ msgstr "Legg til identitet"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Rediger identitet"
+
+#~ msgid "Add Source"
+#~ msgstr "Legg til kilde"
+
+#~ msgid "Edit Source"
+#~ msgstr "Rediger kilde"
+
+#~ msgid "Add News Server"
+#~ msgstr "Legg til news-tjener"
+
+#~ msgid "Edit News Server"
+#~ msgstr "RedigИr news-tjener"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Tester \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Tilkoblingen var vellykket!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "SpЬr etter autorisasjonsegenskaper for \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "SpЬr etter autorisasjon hos \"%s\""
+
+#~ msgid "Address"
+#~ msgstr "Adresse"
+
+#~ msgid "Identities"
+#~ msgstr "Identiteter"
+
+#~ msgid "Mail Sources"
+#~ msgstr "E-post-kilder"
+
+#~ msgid "Mail Transport"
+#~ msgstr "E-post-transport"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Merk melding som sett [ms]: "
+
+#~ msgid "News Servers"
+#~ msgstr "News-tjenere"
+
+#~ msgid "News Sources"
+#~ msgstr "News-kilder"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Send meldinger i HTML-format"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "Ingen GPG/PGP-stЬtte tilgjengelig i denne versjonen av Evolution."
+
+#~ msgid "Create a new contact"
+#~ msgstr "Opprett en ny kontakt"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Slett en kontakt"
+
+#~ msgid "Find"
+#~ msgstr "Finn"
+
+#~ msgid "Find a contact"
+#~ msgstr "Finn en kontakt"
+
+#~ msgid "Print contacts"
+#~ msgstr "Skriv ut kontakter"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Stopp innlesing"
+
+#~ msgid "View All"
+#~ msgstr "Vis alle"
+
+#~ msgid "View all contacts"
+#~ msgstr "Vis alle kontakter"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Konfigurasjon av adressebok..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "S_kriv ut kontakter..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_SЬk etter kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dager"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Endre brukervalg"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Brukervalg for kalender..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Opprett en ny avtale"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Opprett en ny kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Go back in time"
+#~ msgstr "GЕ tilbake i tid"
+
+#~ msgid "Go forward in time"
+#~ msgstr "GЕ fremover i tid"
+
+#~ msgid "Go to"
+#~ msgstr "GЕ til"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "GЕ til en spesifikk dato"
+
+#~ msgid "Go to present time"
+#~ msgstr "GЕ til i dag"
+
+#~ msgid "Month"
+#~ msgstr "MЕned"
+
+#~ msgid "Next"
+#~ msgstr "Neste"
+
+#~ msgid "Open a calendar"
+#~ msgstr "еpne en kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Forrige"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Skriv ut denne kalenderen"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Lagre kalender som noe annet"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Vis 1 dag"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Vis 1 mЕned"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Vis 1 uke"
+
+#~ msgid "Show the working week"
+#~ msgstr "Vis arbeidsuken"
+
+#~ msgid "Week"
+#~ msgstr "Uke"
+
+#~ msgid "_New"
+#~ msgstr "_Ny"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_еpne kalender"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "S_kriv ut denne kalenderen"
+
+#~ msgid "_Save As..."
+#~ msgstr "Lagre _som..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Slett denne oppfЬringen"
+
+#~ msgid "Delete..."
+#~ msgstr "Slett..."
+
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Skriv ut konvolutt..."
+
+#~ msgid "Print this item"
+#~ msgstr "Skriv ut denne oppfЬringen"
+
+#~ msgid "Print..."
+#~ msgstr "Skriv ut..."
+
+#~ msgid "Save _As..."
+#~ msgstr "L_agre som..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Lagre og lukk"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Lagre kontakten og lukk dialogboksen"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Se_nd kontakt til andre..."
+
+#~ msgid "See online help"
+#~ msgstr "Se hjelp"
+
+#~ msgid "_File"
+#~ msgstr "_Fil"
+
+#~ msgid "_Print..."
+#~ msgstr "S_kriv ut..."
+
+#~ msgid "_Save"
+#~ msgstr "_Lagre"
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikasjonen"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "C_lear"
+#~ msgstr "T_Ьm"
+
+#~ msgid "C_ut"
+#~ msgstr "Klipp _ut"
+
+#~ msgid "Clear"
+#~ msgstr "TЬm"
+
+#~ msgid "Clear the selection"
+#~ msgstr "TЬm utvalget"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Lukk denne avtalen"
+
+#~ msgid "Copy"
+#~ msgstr "KopiИr"
+
+#~ msgid "Copy the selection"
+#~ msgstr "KopiИr utvalget"
+
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut utvalget"
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump beskrivelse av grensesnittet som XML"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "Addresse_bok..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "Sjek_k navn"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "U_komplett oppgave"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Sett inn fil"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Gjentakelse..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "_Formatering"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Ny avtale"
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "Hva gЕr her?"
+
+#~ msgid "Find Again"
+#~ msgstr "Finn igjen"
+
+#~ msgid "Find _Again"
+#~ msgstr "Finn ig_jen"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Endre filens egenskaper"
+
+#~ msgid "N_ext"
+#~ msgstr "N_este"
+
+#~ msgid "Paste"
+#~ msgstr "Lim inn"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Lim inn fra utklippstavlen"
+
+#~ msgid "Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Skriveropps_ett..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Skriveroppsett"
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Redo"
+#~ msgstr "Gjenopprett"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Gjenopprett angret handling"
+
+#~ msgid "Replace"
+#~ msgstr "Erstatt"
+
+#~ msgid "Replace a string"
+#~ msgstr "Erstattt en streng"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Lagre avtalen og lukk dialogboksen"
+
+#~ msgid "Save the current file"
+#~ msgstr "Lagre aktiv fil"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Sett opp mЬte"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Sett opp _mЬte"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Sett opp ett eller annet mЬte"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "SЬk etter samme streng pЕ nytt"
+
+#~ msgid "Search for a string"
+#~ msgstr "SЬk etter en streng"
+
+#~ msgid "Select All"
+#~ msgstr "Velg alle"
+
+#~ msgid "Select everything"
+#~ msgstr "Velg alt"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "RedigИr sideinnstillinger for aktiv skriver"
+
+#~ msgid "Undo"
+#~ msgstr "Angre"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Angre siste handling"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Close"
+#~ msgstr "L_ukk"
+
+#~ msgid "_Copy"
+#~ msgstr "_KopiИr"
+
+#~ msgid "_Debug"
+#~ msgstr "_FeilsЬk"
+
+#~ msgid "_Edit"
+#~ msgstr "R_edigИr"
+
+#~ msgid "_Find..."
+#~ msgstr "_Finn..."
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "_Paste"
+#~ msgstr "_Lim inn"
+
+#~ msgid "_Print"
+#~ msgstr "S_kriv ut"
+
+#~ msgid "_Properties..."
+#~ msgstr "Egenska_per..."
+
+#~ msgid "_Redo"
+#~ msgstr "Gjenopp_rett"
+
+#~ msgid "_Replace..."
+#~ msgstr "E_rstatt..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Angre"
+
+#~ msgid "Compose"
+#~ msgstr "KomponИr"
+
+#~ msgid "Compose a new message"
+#~ msgstr "KomponИr en ny melding"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "KopiИr meldingen til en ny mappe"
+
+#~ msgid "F_older"
+#~ msgstr "M_appe"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrИr etter sender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "F_iltrИr etter mottaker"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Glem _passord"
+
+#~ msgid "Get Mail"
+#~ msgstr "Hent e-post"
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Skjul slette_de meldinger"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Skjul le_ste meldinger"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "_Skjul valgte meldinger"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "E-post _filtre..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "HЕndtИr abonnement..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_kИr som lest"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merk som _ulest"
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Flytt meldingen til en ny mappe"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Viser forhЕndsvisning av meldingen som skal skrives ut"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vis forhЕndsvisning av melding..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Skriv ut denne meldingen pЕ skriveren"
+
+#~ msgid "Print message..."
+#~ msgstr "Skriv ut melding..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Svar til _alle"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til _sender"
+
+#~ msgid "Select _All"
+#~ msgstr "Velg _alle"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Send kЬlagt e-post og hent ny e-post"
+
+#~ msgid "Show _All messages"
+#~ msgstr "Vis _alle meldinger"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Meldingsliste med trЕder"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VFolder for se_nder"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VFolder for mottake_re"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vis rЕ meldingskode"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_PЕfЬr filtre"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_KopiИr til mappe..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "R_edigИr melding"
+
+#~ msgid "_Expunge"
+#~ msgstr "_TЬm"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_FiltrИr etter emne"
+
+#~ msgid "_Forward"
+#~ msgstr "_Videresend"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Re_versИr utvalg"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_E-post konfigurasjon..."
+
+#~ msgid "_Message"
+#~ msgstr "_Melding"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "F_lytt til mappe..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_еpne i nytt vindu"
+
+#~ msgid "_Print Message"
+#~ msgstr "S_kriv ut melding"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagre melding _som..."
+
+#~ msgid "_Source"
+#~ msgstr "_Kildekode"
+
+#~ msgid "_Threaded"
+#~ msgstr "Med _trЕder"
+
+#~ msgid "_Undelete"
+#~ msgstr "A_ngre slett"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VFolder for emne"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Redigering av _virtuelle mapper..."
+
+#~ msgid "Attach"
+#~ msgstr "Legg ved"
+
+#~ msgid "Close the current file"
+#~ msgstr "Lukk aktiv fil"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "KryptИr denne meldingen med PGP"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Sett inn en tekstfil i meldingen"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Sett inn tekstfil..."
+
+#~ msgid "Open a file"
+#~ msgstr "еpne en fil"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "KryptИr med PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "SignИr med PGP"
+
+#~ msgid "Save As"
+#~ msgstr "Lagre som"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Lagre i _mappe..."
+
+#~ msgid "Save in folder..."
+#~ msgstr "Lagre i mappe..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Lagre aktiv fil med et nytt navn"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Lagre meldingen i en spesifisert mappe"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Send _Later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send _later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Send meldingen i HTML-format"
+
+#~ msgid "Send the message later"
+#~ msgstr "Send meldingen senere"
+
+#~ msgid "Send the message now"
+#~ msgstr "Send meldingen nЕ"
+
+#~ msgid "Send this message now"
+#~ msgstr "Send denne meldingen nЕ"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Vis/skjul vedlegg"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Vis _vedlegg"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "SignИr denne meldingen med din PGP-nЬkkel"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Sett _inn tekstfil..."
+
+#~ msgid "_Open..."
+#~ msgstr "_еpne..."
+
+#~ msgid "_Security"
+#~ msgstr "_Sikkerhet"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Legg til mappe pЕ listen over abonnerte mapper"
+
+#~ msgid "Refresh List"
+#~ msgstr "Les listen pЕ nytt"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Les mappelisten pЕ nytt"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Fjern mappe fra din liste over abbonerte mapper"
+
+#~ msgid "Subscribe"
+#~ msgstr "AbonnИr"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Fjern abonnement"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Vis en annen mappe"
+
+#~ msgid "E_xit"
+#~ msgstr "A_vslutt"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution-linje _snarvei"
+
+#~ msgid "Exit the program"
+#~ msgstr "Avslutt programmet"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kom _igang"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Vis informasjon om Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Vis _mappelinjen"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Sen_d inn feilrapport"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Send inn feilrapport ved bruk av Bug Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "SlЕ av/pЕ visning av mappelinjen"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "SlЕ av/pЕ visning av snarveilinjen"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Bruk av k_ontaktdatabasen"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Bruk av _kalenderen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Bruk av e-_postprogrammet"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Om Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Avtale"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt"
+
+#~ msgid "_Folder"
+#~ msgstr "_Mappe"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_GЕ til mappe..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "Send _melding"
+
+#~ msgid "_Settings"
+#~ msgstr "Inn_stillinger"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Oppgave"
 
 #~ msgid "Automatically check mail every "
 #~ msgstr "Sjekk etter e-post hver "
@@ -7068,9 +6934,6 @@ msgstr "Gruppe %i"
 #~ msgid "minute(s)"
 #~ msgstr "minutt(er)"
 
-#~ msgid "categories"
-#~ msgstr "kategorier"
-
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "OppfЬring(er) hЬrer til disse kategoriene:"
 
@@ -7162,30 +7025,6 @@ msgstr "Gruppe %i"
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "MЬteforesp_Ьrsel"
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sideoppsett"
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "Ne_xt"
-#~ msgstr "Nes_te"
-
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
 #~ msgid "External Directories"
 #~ msgstr "Eksterne kataloger"
 
@@ -7408,16 +7247,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan ikke hente melding: %s"
 
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "UNIX e-post filer i mbox-format"
-
-#~ 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."
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunne ikke endre navn pЕ mappe %s til %s: mЕlet eksisterer"
 
@@ -7442,9 +7271,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot append message to mh folder: %s"
 #~ msgstr "Kan ikke legge til melding i mh-mappe: %s"
 
-#~ msgid "UNIX MH-format mail directories"
-#~ msgstr "UNIX e-postkataloger i MH-format"
-
 #~ msgid "Could not rename folder `%s': %s"
 #~ msgstr "Kunne ikke endre navn pЕ mappe `%s': %s"
 
@@ -7475,9 +7301,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
-#~ msgid "Flagged"
-#~ msgstr "Merket"
-
 #~ msgid "Set Flag"
 #~ msgstr "Sett flagg"
 
@@ -7493,9 +7316,6 @@ msgstr "Gruppe %i"
 #~ msgid "_Open"
 #~ msgstr "_еpne"
 
-#~ msgid "Create a new folder"
-#~ msgstr "Opprett en ny mappe"
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "Opprett ny mappe..."
 
@@ -7605,9 +7425,6 @@ msgstr "Gruppe %i"
 #~ msgid "Preferences"
 #~ msgstr "Brukervalg"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmer"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Egenskaper for alarmer"
 
@@ -7852,9 +7669,6 @@ msgstr "Gruppe %i"
 #~ msgid "End on "
 #~ msgstr "Slutt pЕ "
 
-#~ msgid "End after"
-#~ msgstr "Slutt etter"
-
 #~ msgid "Change"
 #~ msgstr "Endre"
 
diff --git a/po/pl.po b/po/pl.po
index b184826a99..21a8726832 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,8 +1,8 @@
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -10,11 +10,184 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Nie mo©na zainicjowaФ Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "Pliki z listami w uniksowym formacie mbox"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Nie ma komputera o nazwie %s."
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Sendmail"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Zamknij"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Przenie╤ do foldera"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Przechodzi do poprzedniego elementu"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Przechodzi do nastЙpnego elementu"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Skonfiguruj folder"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nie mo©na otworzyФ pliku %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "BЁ╠d przy odczycie pliku z listem: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "bez bЁЙdu"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP pod adresem %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nowy"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Tworzy nowy folder"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Nie mo©na zainicjowaФ Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -22,7 +195,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -30,25 +203,25 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -56,7 +229,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -64,7 +237,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -72,7 +245,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -80,13 +253,13 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -94,7 +267,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -102,13 +275,13 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -116,7 +289,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -124,13 +297,13 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -138,7 +311,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -146,7 +319,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -154,7 +327,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -162,13 +335,13 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -176,7 +349,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -184,7 +357,7 @@ msgstr ""
 "\n"
 "PoЁo©enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -192,13 +365,13 @@ msgstr ""
 "\n"
 "Stanowisko sЁu©bowe: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -206,7 +379,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -214,7 +387,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -222,7 +395,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -230,7 +403,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -238,7 +411,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -246,7 +419,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -264,13 +437,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -278,17 +451,6 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Nie mo©na zainicjowaФ Bonobo"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -406,40 +568,32 @@ msgstr ""
 "Podczas prСby pobrania listy pilotСw od demona\n"
 "gnome-pilot wyst╠piЁ bЁ╠d"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Nie mo©na uruchomiФ serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Nie mo©na uruchomiФ wombata"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Usun╠Ф kontakt?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -449,7 +603,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_UsuЯ"
 
@@ -462,14 +616,7 @@ msgstr "Typy telefonСw"
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Dodaj"
 
@@ -527,7 +674,6 @@ msgid "C_ontacts..."
 msgstr "_Kontakty..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "K_ategorie..."
 
@@ -544,8 +690,6 @@ msgid "_Address..."
 msgstr "_Adres..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "OgСlne"
 
@@ -590,24 +734,27 @@ msgid "No_tes:"
 msgstr "_Notatki:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "SzczegСЁy"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Asystent"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Praca"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Praca 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Faks sЁu©bowy"
 
@@ -616,6 +763,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "SamochСd"
 
@@ -625,28 +773,33 @@ msgstr "Firma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Dom"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Dom 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Faks w domu"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Przeno╤ny"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Inne"
 
@@ -655,10 +808,12 @@ msgid "Other Fax"
 msgstr "Inny faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "GЁСwny"
 
@@ -675,64 +830,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Adres _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-#, fuzzy
-msgid "Canada"
-msgstr "Terminarz"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "_Kraj:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#, fuzzy
-msgid "Finland"
-msgstr "Znajd╪"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Adres:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Miasto:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Stan/Prowincja:"
-
-#: addressbook/contact-editor/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.
@@ -791,12 +898,7 @@ msgstr "_Przyrostek:"
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Jako _tabela"
 
@@ -821,27 +923,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Wy╤wietl wszystkie"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
 
@@ -870,9 +972,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "HasЁo"
 
@@ -908,12 +1010,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Godziny"
@@ -933,12 +1033,10 @@ msgid "Search Scope:"
 msgstr "Wyszukiwanie"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Uwierzytelnianie:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "╕cie©ka:"
 
@@ -964,205 +1062,90 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Nazwa:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Dodaj ╪rСdЁo"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "UsuЯ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Edycja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-#, fuzzy
-msgid "Name"
-msgstr "Nazwa:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Znajd╪..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Odbiorcy listu"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Wybierz nazw"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Wybierz nazwЙ z listy:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-#, fuzzy
-msgid "a"
-msgstr "am"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 #, fuzzy
-msgid "e"
-msgstr "╕r"
+msgid "Name"
+msgstr "Nazwa:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "f"
-msgstr "Lista warunkСw"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
+msgid "Email"
+msgstr "E-mail 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
-#, fuzzy
-msgid "i"
-msgstr "jest"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organizacja"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "k"
-msgstr "Ok"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
+msgid "Department"
+msgstr "_OddziaЁ:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 #, fuzzy
-msgid "m"
-msgstr "am"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr ""
+msgid "Office"
+msgstr "_Biuro:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 #, fuzzy
-msgid "o"
-msgstr "Po"
+msgid "Title"
+msgstr "_TytuЁ:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 #, fuzzy
-msgid "p"
-msgstr "pm"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
+msgid "Profession"
+msgstr "_ZawСd:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 #, fuzzy
-msgid "r"
-msgstr "Pt"
+msgid "Manager"
+msgstr "Pager"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 #, fuzzy
-msgid "s"
-msgstr "jest"
+msgid "Nickname"
+msgstr "_Przydomek:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 #, fuzzy
-msgid "t"
-msgstr "."
+msgid "Spouse"
+msgstr "╛rСdЁo"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 #, fuzzy
-msgid "u"
-msgstr "Ni"
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr ""
+msgid "Note"
+msgstr "Brak"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Zapisz jako VCard"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi╠©ce adresowej"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1171,179 +1154,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10-punktowa Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8-ounktowa Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Tre╤Ф"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "DСЁ:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Wymiary:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Czcionka..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Czcionki"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Stopka:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "GЁСwka"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "GЁСwka/Stopka"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Wysoko╤Ф:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Pejza©"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Lewy:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "ZakЁadki liter z boku"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Marginesy"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "Liczba kolumn:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Opcje"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "UЁo©enie"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Strona"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Ustawienia strony:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papier"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "╛rСdЁo papieru:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Portret"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Podgl╠d:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Odwrotnie na stronach parzystych"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Prawy:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sekcje:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Rozmiar:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Rozpoczynanie na nowej stronie"
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Nazwa stylu:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "GСra:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Typ:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Szeroko╤Ф:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "etykieta26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1352,13 +1162,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "BЁ╠d przy komunikacji z serwerem terminarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1370,71 +1180,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Terminarz"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Przypomnienie o terminie "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr ""
 
@@ -1444,25 +1200,25 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "OtwСrz terminarz"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Zapisz terminarz"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1470,60 +1226,57 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1535,7 +1288,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1543,27 +1296,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1573,851 +1326,405 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Priorytet musi siЙ zawieraФ w przedziale od 1 do 9 wЁ╠cznie"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "BЁ╠d przy odczycie pliku : %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
-#, fuzzy
-msgid "Loading Calendar"
-msgstr "Drukuj terminarz"
-
-#: calendar/gui/control-factory.c:125
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Zamknij"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Modyfikuj termin"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/calendar-summary.c:484
 #, fuzzy
-msgid "05 minutes"
-msgstr "minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "10 minutes"
-msgstr "minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12-godzinny (am/pm)"
+msgid "Display"
+msgstr "_Wy╤wietlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/calendar-summary.c:489
 #, fuzzy
-msgid "15 minutes"
-msgstr "minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24-godzinny"
+msgid "Show appointments"
+msgstr "Wy╤wietlanie czasu koЯca terminu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/calendar-summary.c:497
 #, fuzzy
-msgid "30 minutes"
-msgstr "minut"
+msgid "Show tasks"
+msgstr "PrzeЁ╠cza wy╤wietlanie zaЁ╠cznikСw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
-msgid "60 minutes"
-msgstr "minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Alarmy d╪wiЙkowe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr "SygnaЁ d╪wiЙkowy przy pojawianiu siЙ okien alarmu."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Terminarz"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Ustawienia termiarza"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Kolory"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "Kompresowanie weekendСw"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Opcje wyboru daty"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Domy╤lne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Opcje wy╤wietlania"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Data wykonania"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Koniec dnia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Pierwszy dzieЯ tygodnia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pi╠"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "Pi╠tek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "PoniedziaЁek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "WybСr koloru"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Priorytet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sob"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "Sobota"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/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:46
-msgid "Show week numbers"
-msgstr "Wy╤wietlanie numerСw tygodni"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Pocz╠tek dnia:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Nie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Niedziela"
+msgid "Loading Calendar"
+msgstr "Drukuj terminarz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
+#: calendar/gui/control-factory.c:127
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Czw"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "PrzedziaЁy czasu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Format czasu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Wto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Alarmy wizualne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "╕ro"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "╕roda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "TydzieЯ roboczy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% _zakoЯczenia:"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
+msgstr "Modyfikuj zadanie"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#, fuzzy
-msgid "Cancelled"
-msgstr "Anuluj"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#, fuzzy
-msgid "Completed"
-msgstr "% _zakoЯczenia:"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Data zakoЯczenia:"
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
+msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#, fuzzy
-msgid "High"
-msgstr "Wysoko╤Ф:"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/e-calendar-table.c:154
 #, fuzzy
-msgid "Low"
-msgstr "teraz"
+msgid "Categories"
+msgstr "kategorie"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Brak"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Klasyfikacja"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
-msgid "Not Started"
-msgstr "_Rozpoczynanie"
+msgid "Completion Date"
+msgstr "% _zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Czas _zakoЯczenia"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Zadanie"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Kontakty..."
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Data wykonania"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Priorytety:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_Stan:"
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Oznacza zadanie jako zakoЯczone"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Priorytet"
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
-msgstr "Modyfikuj zadanie"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
-msgstr "Zadanie - %s"
-
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:166
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarmy d╪wiЙkowe"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "OtwСrz..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Otwiera zadanie"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Oznacz jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Oznacza zadanie jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "UsuЯ"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Usuwa zadanie"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nowy termin..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Modyfikuj termin..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "UsuЯ termin"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "PrzeksztaЁФ ten termin w przesuwalny"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "UsuЯ to wyst╠pienie"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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:342
-msgid "%d %B"
-msgstr "%d %B"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Wydarzenie _caЁodniowe"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Podstawowe elementy"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Klasyfikacja"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr "Dowolna powtarzalno╤Ф"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "Wyj╠tki"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Godziny"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "_Adresat listu:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Minuty"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "ZmieЯ"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Brak powtarzalno╤ci"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
-msgstr "Podgl╠d"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "P_rywatny"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "Pu_bliczny"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "Powtarzalno╤Ф"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "ReguЁa powtarzalno╤ci"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "Przypominanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "Prosta powtarzalno╤Ф"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr "Z_estawienie:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Czas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_D╪wiЙk"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Tajny"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_Wy╤wietlanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "Czas _zakoЯczenia"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_List"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "U_ruchomiany program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "Czas _rozpoczЙcia:"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Czas _rozpoczЙcia:"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dzieЯ/dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
 msgstr ""
+"\n"
+"Kategorie: "
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "etykieta21"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "miesiЙcy"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "tygodni"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "lat"
+#. 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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:331
 msgid "Edit Appointment"
 msgstr "Modyfikuj termin"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:409
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dzieЯ"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "PoniedziaЁek"
+
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "╕roda"
+
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Pi╠tek"
+
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Sobota"
+
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "powtСrzenia"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Nie mo©na otworzyФ foldera \"%s\":\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "kwiecieЯ"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "sierpieЯ"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "grudzieЯ"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "luty"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Przejd╪ do daty:"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Przejd╪ do dnia dzisiejszego"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "styczeЯ"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "lipiec"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Nie"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "czerwiec"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Pon"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "marzec"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Wto"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "PoniedziaЁek"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "╕ro"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "listopad"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Czw"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "pa╪dziernik"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Pi╠"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "wrzesieЯ"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sob"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Nie mo©na zainicjowaФ Bonobo"
@@ -2610,10 +1917,15 @@ msgstr "Bie©╠cy rok (%Y)"
 msgid "Print Calendar"
 msgstr "Drukuj terminarz"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Podgl╠d wydruku"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2704,61 +2016,69 @@ msgstr "Nie mo©na wczytaФ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo©na wczytaФ %s: Brak kodu inicjuj╠cego w module."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Anuluj"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, 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:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "OtwСrz terminarz"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u©ytkownika"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest ╤cie©ka"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Nie ma komputera o nazwie %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protokoЁu \"%s\""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2767,17 +2087,17 @@ msgstr ""
 "Nie mo©na utworzyФ katalogu %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL \"%s\" nie zawiera nazwy protokoЁu"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL \"%s\" nie zawiera niepoprawn╠ nazwЙ protokoЁu"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Numer portu w URL-u \"%s\" nie jest numeryczny"
@@ -2794,40 +2114,41 @@ msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
 msgid "Bad authentication response from server."
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodЁo siЙ polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Nieznany bЁ╠d"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, 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:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo©na odnale╪Ф tre╤ci listu w odpowiedzi na FETCH."
 
@@ -2839,29 +2160,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 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:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 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:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, 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:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2872,30 +2193,30 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo©na utworzyФ katalogu %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr ""
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "Lokalny katalog z listami %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
-#, fuzzy
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Pliki z listami w uniksowym formacie mbox"
+msgid "Standard Unix mailbox file"
+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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3237,8 +2558,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, 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"
@@ -3267,40 +2588,40 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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:337
+#: 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:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3309,18 +2630,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:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3329,13 +2650,12 @@ 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:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3391,38 +2711,32 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "WysyЁanie listСw za pomoc╠ programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Uwierzytelnianie:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
@@ -3430,101 +2744,101 @@ msgstr ""
 "Przy tej opcji nast╠pi poЁ╠czenie z serwerem IMAP z wykorzystaniem "
 "uwierzytelniania Kerberos 4."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "WysyЁanie listСw za pomoc╠ programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Nie mo©na utworzyФ potoku do programu sendmail: %s: poczta nie zostaЁa "
 "wysЁana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Nie mo©na wykonaФ %s: poczta nie zostaЁa wysЁana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Nie mo©na wykonaФ %s: poczta nie zostaЁa wysЁana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 "Nie mo©na utworzyФ procesu dla programu sendmail: %s: poczta nie zostaЁa "
 "wysЁana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Program sendmail zostaЁ przerwany przez sygnaЁ %s: poczta nie zostaЁa "
 "wysЁana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Nieznany bЁ╠d: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3567,12 +2881,11 @@ msgid "attachment"
 msgstr "zaЁ╠cznik"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "ZaЁ╠czenie pliku"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "UsuЯ"
 
@@ -3588,67 +2901,51 @@ msgstr "Dodaj zaЁ╠cznik..."
 msgid "Attach a file to the message"
 msgstr "ZaЁ╠cza plik do listu"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Nazwa pliku:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Typ MIME:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyФ ksi╠©kЙ adresow╠"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Podaj temat listu"
 
@@ -3659,38 +2956,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "BЁ╠d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "BЁ╠d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Zapisywanie zmian listu..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Zapisz zmiany listu..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3700,29 +2997,29 @@ msgstr ""
 "\n"
 "Czy chcesz zapisaФ zmiany?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Otwiera plik"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Podany plik nie istnieje."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Podany plik nie jest zwykЁym plikiem."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Podany plik istnieje, lecz nie mo©na go odczytaФ."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3730,26 +3027,22 @@ msgstr ""
 "Plik jest bardzo du©y (wiЙkszy ni© 100K).\n"
 "Czy na pewno chcesz go wstawiФ?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Podczas odczytu pliku wyst╠piЁ bЁ╠d."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "_Wyszukiwanie"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "rok"
@@ -3881,7 +3174,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3982,189 +3275,169 @@ msgstr ""
 msgid "Read"
 msgstr "PonСw"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Modyfikacja VFolderСw"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "ReguЁy filtrСw"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "Obrys:"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Wirtualne foldery"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "╛rСdЁa VFolderСw"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "przed"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "zawiera"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiuj do foldera"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data wysЁania"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Wyra©enie"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Prze╤lij na adres"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Tre╤Ф listu"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "nie zawiera"
+msgid "Message Header"
+msgstr "NagЁСwek listu"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "nie koЯczy siЙ na"
+msgid "Message was received"
+msgstr "List zostaЁ otrzymany"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "nie istnieje"
+msgid "Message was sent"
+msgstr "List zostaЁ wysЁany"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr ""
+msgid "Move to Folder"
+msgstr "Przenie╤ do foldera"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "nie rozpoczyna siЙ od"
+msgid "Recipients"
+msgstr "Lista odbiorcСw"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "koЯczy siЙ na"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "istnieje"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Wyra©enie"
+msgid "Sender"
+msgstr "Nadawca"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Prze╤lij na adres"
+#, fuzzy
+msgid "Set Status"
+msgstr "_Stan:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "jest"
+msgid "Source"
+msgstr "╛rСdЁo"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "jest wiЙkszy ni©"
+msgid "Specific header"
+msgstr "Okre╤lony nagЁСwek"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "jest mniejszy ni©"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_Stan:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "nie jest"
+msgid "Stop Processing"
+msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Tre╤Ф listu"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Temat"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "NagЁСwek listu"
+msgid "after"
+msgstr "po"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "List zostaЁ otrzymany"
+msgid "before"
+msgstr "przed"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "List zostaЁ wysЁany"
+msgid "contains"
+msgstr "zawiera"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Przenie╤ do foldera"
+msgid "does not contain"
+msgstr "nie zawiera"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "w lub po"
+msgid "does not end with"
+msgstr "nie koЯczy siЙ na"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "w lub przed"
+msgid "does not exist"
+msgstr "nie istnieje"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Lista odbiorcСw"
+msgid "does not start with"
+msgstr "nie rozpoczyna siЙ od"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "koЯczy siЙ na"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Nadawca"
+msgid "exists"
+msgstr "istnieje"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "_Stan:"
+msgid "is greater than"
+msgstr "jest wiЙkszy ni©"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "jest mniejszy ni©"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "╛rСdЁo"
+msgid "is not"
+msgstr "nie jest"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Okre╤lony nagЁСwek"
+msgid "is"
+msgstr "jest"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr ""
+msgid "on or after"
+msgstr "w lub po"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_Stan:"
+msgid "on or before"
+msgstr "w lub przed"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Zatrzymanie przetwarzania"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Temat"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4182,10 +3455,6 @@ msgstr "Dodaj reguЁЙ"
 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 "Dodaj reguЁЙ VFoldera"
@@ -4194,217 +3463,166 @@ msgstr "Dodaj reguЁЙ VFoldera"
 msgid "Edit VFolder Rule"
 msgstr "Zmodyfikuj reguЁЙ VFoldera"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Zapisz"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "WybСr foldera"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Tre╤Ф lub temat zawiera"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Tre╤Ф zawiera"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Tre╤Ф nie zawiera"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "UtwСrz VFolder w oparciu o temat"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "UtwСrz VFolder w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "UtwСrz VFolder w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "UtwСrz filtr w oparciu o temat"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "UtwСrz filtr w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "UtwСrz filtr w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Wy╤wietl wszystkie"
-
-#: mail/folder-browser.c:657
-#, fuzzy
-msgid "Hide selected"
-msgstr "UsuniЙty"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Ukryj"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "UsuniЙty"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Temat"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "UtwСrz filtr w oparciu o nadawcЙ"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "OtwСrz"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Edycja"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Drukuj"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Prze╤lij"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Przemieszcza w czasie do przodu"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Oznacz jako przeczytany"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Oznacz jako nieprzeczytany"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Przenie╤ do foldera..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Kopiuj do foldera..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "UtwСrz reguЁЙ na podstawie listu"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Wydrukuj list"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠ (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr ""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Brak"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "Current store format:"
-msgstr "Nie mo©na uruchomiФ wombata"
+msgid " (default)"
+msgstr "Domy╤lne"
 
-#: mail/local-config.glade.h:7
-msgid "Mailbox Format"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:8
-#, fuzzy
-msgid "New store format:"
-msgstr "Format czasu:"
-
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
-
-#: mail/local-config.glade.h:10
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-msgid "mbox"
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Instalacja Evolution"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4426,7 +3644,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4434,31 +3652,27 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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 "Nie skonfigurowano ©adnych ╪rСdeЁ listСw"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Nie zostaЁ skonfigurowany folder Poczta wychodz╠ca"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4466,23 +3680,27 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "NaprawdЙ wysЁaФ?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "PrzesЁany list:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Przenoszenie listСw do foldera"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopiowanie listСw do foldera"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4490,11 +3708,11 @@ msgstr ""
 "Mo©liwe jest redagowanie wyЁ╠cznie\n"
 "listСw zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "NadpisaФ plik?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4502,17 +3720,17 @@ msgstr ""
 "Plik o tej nazwie ju© istnieje.\n"
 "NadpisaФ go?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Zapisz jako..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Zapisz jako..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4521,459 +3739,33 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiodЁo siЙ"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Brak informacji"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Zaawansowane..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "Uwierzytelnianie:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "Uwierzytelnianie:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Domy╤lne"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "bez usuwania listСw z serwera"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Brak"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "Adres e-mail:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "Adres e-mail:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Konfiguracja poczty"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "PeЁna nazwa:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "nazwa u©ytkownika:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Dane osobowe"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_List"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "E-mail zawiera"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "Konfiguracja poczty"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Konfiguracja poczty"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Nowy"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Opcje"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacja:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "HasЁo"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Odpowiedz"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "_Wymagani ludzie"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Zapisz jako VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Plik z podpisem:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Konfiguracja poczty"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Serwer:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Serwer:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Plik z podpisem:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Plik z podpisem:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "╛rСdЁa"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Typ:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Brak informacji"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "nazwa u©ytkownika:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minut"
-
-#: 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:446
-msgid "Full name:"
-msgstr "PeЁna nazwa:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "Adres e-mail:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Plik z podpisem"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Serwer:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Wykryj obsЁugiwane typy..."
-
-#: 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:1003
-msgid "Test Settings"
-msgstr "Przetestuj ustawienia"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Typ ╪rСdЁa listСw:"
-
-#: mail/mail-config-gui.c:1135
-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: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"
-"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:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Dodaj ╪rСdЁo"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Zmodyfikuj ╪rСdЁo"
-
-#: 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
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Testing \"%s\""
-msgstr "Testowanie \"%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 "PoЁ╠czenie zakoЯczyЁo siЙ powodzeniem!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adres"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "╛rСdЁa listСw"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "OpС╪nienie oznaczania listu jako widzianego [ms]: "
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organizacja"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "WysyЁanie listСw w formacie HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Nie podano hasЁa."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo©na utworzyФ potoku do GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Brak dostЙpnego programu GPG/PGP."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5010,65 +3802,65 @@ msgstr "OtwСrz za pomoc╠ programu %s..."
 msgid "View Inline"
 msgstr "Wy╤wietl na miejscu"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "ZewnЙtrzna przegl╠darka"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy╤wietl na miejscu (za pomoc╠ programu %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "ZaЁ╠cznik %s"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "W tej kopii Evolution nie jest dostЙpna obsЁuga GPG/PGP"
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikonЙ aby rozszyfrowaФ."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska╪nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska╪nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5126,7 +3918,7 @@ msgid "Register local folder"
 msgstr "Zarejestruj lokalny folder"
 
 # y, c-format
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5158,161 +3950,161 @@ msgstr ""
 msgid "Working"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrowanie listu na ©╠danie"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtruj list na ©╠danie"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "WysyЁanie \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Natychmiast wysyЁa wiadomo╤Ф"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "WysyЁanie kolejki"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Wy╤lij kolejkЙ"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "DoЁ╠czanie \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "DoЁ╠czanie listu bez tematu"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Przenoszenie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiowanie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Przenie╤ listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Skopiuj listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Brak opisu)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "PrzesЁany list:\n"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Nie mo©na utworzyФ procesu dla %s: %s"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronizowanie \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Czyszczenie \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %d z %d"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Pobieranie listu %d z %d"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Wczytywanie foldera %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Wczytywanie foldera %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Kopiowanie listСw"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Nie mo©na otworzyФ lub utworzyФ pliku .newsrc dla %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Zaznaczanie listu %d z %d"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5323,7 +4115,7 @@ msgstr "BЁ╠d przy zapisie pliku: %s"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5427,116 +4219,195 @@ msgstr "Nowy VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Odpowiada nadawcy listu"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Odpowiada wszystkim odbiorcom listu"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "PrzesyЁa list dalej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Drukuje list"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Usuwa list"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Nieznany"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Oznaczony"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "zaЁ╠cznik"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "Od:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Data wykonania"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Data otrzymania"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Dla:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Rozmiar:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Wprowad╪ hasЁo NNTP dla %s@%s"
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Brak dostЙpnego programu GPG/PGP."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Nie podano hasЁa."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nie mo©na utworzyФ potoku do GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Foldery"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "╛rСdЁo"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5634,23 +4505,24 @@ msgstr ""
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:111
+#: 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."
 
-#: shell/e-shell-view-menu.c:117
+#: 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:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5662,7 +4534,7 @@ msgstr ""
 "i zarz╠dzanie kontaktami w\n"
 "╤rodowisku GNOME."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr ""
 
@@ -5670,13 +4542,18 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Foldery"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5684,73 +4561,83 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo©na ustawiФ lokalnego pojemnika -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Wy╤wietlanie paska _skrСtСw"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Wy╤wietlanie paska _skrСtСw"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5758,12 +4645,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Widok"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Wy╤wietla zaznaczony folder"
 
@@ -5877,1243 +4763,1678 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo©na zainicjowaФ systemu komponentСw Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Tworzy nowy kontakt"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Nowy termin"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "UsuЯ kontakt"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Znajd╪"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Odnajduje kontakt"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nowy"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Drukuj kontakty"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Zatrzymaj"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Zatrzymuje wczytywanie"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Wy╤wietl wszystkie"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Wy╤wietla wszystkie kontakty"
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "Konfiguracja _listСw"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Drukuj kontakty..."
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_Szukaj kontaktСw"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_NarzЙdzia"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 dni"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Ustawienia strony:"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Terminarz"
+msgid "FIXME: Paste _Special..."
+msgstr "P_isownia..."
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Ustawienia terminarza..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Oznacz jako nieprzeczytany"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Tworzy nowy termin"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Obiekt"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Tworzy nowy termianrz"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "DzieЯ"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Przemieszcza w czasie do tyЁu"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Przemieszcza w czasie do przodu"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Przejd╪"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Przemieszcza do podanej daty"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "_Kontakt"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Przemieszcza do bie©╠cego czasu"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Miesi╠c"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Poprzedni"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
 msgstr "NastЙpny"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Otwiera terminarz"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Poprzedni"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "_Plik..."
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Drukuje terminarz"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Zapisuje terminarz w innej formie"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Wy╤wietla jeden dzieЯ"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "_Czcionka..."
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Wy╤wietla jeden miesi╠c"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "_Akapit..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Wy╤wietla jeden tydzieЯ"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Wy╤wietla tydzieЯ roboczy"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Dzi╤"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "TydzieЯ"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nowy"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "_OtwСrz terminarz"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "P_isownia..."
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml:142
 #, fuzzy
-msgid "_Save As..."
-msgstr "Zapisz j_ako..."
-
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Usuwa bie©╠cy element"
-
-#: ui/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "UsuЯ..."
-
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Pomoc"
+msgid "FIXME: _New Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Drukuje bie©╠cy element"
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Drukuj..."
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Wy╤lij _list do kontaktu..."
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Zapisz j_ako..."
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Zapisz i zamknij"
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "P_isownia..."
 
-#: ui/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:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "_Akapit..."
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Wy╤lij _list do kontaktu..."
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "P_isownia..."
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Plik"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "_Drukuj..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Zapisz"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Wstaw"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "Informacje o aplikacji"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Informacje o..."
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_NarzЙdzia"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "_Czynno╤ci"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "Wyc_zy╤Ф"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Poprzedni"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "_Wytnij"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Przechodzi do poprzedniego elementu"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Wyczy╤Ф"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "_Kontakt"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Czy╤ci zaznaczenie"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Przechodzi do nastЙpnego elementu"
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Zamyka termin"
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopiuj"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Kopiuje zaznaczenie"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "ZajЙty"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Wytnij"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Poza biurem"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Wycina zaznaczenie"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Brak informacji"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "Wypisz XML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Wypisuje opis interfejsu u©ytkownika w XML-u"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opcje"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Wy╤wietlanie _tylko godzin roboczych"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Wszyscy ludzie i zasoby"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Wszyscy _ludzie i jeden zasСb"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Wymagani ludzie"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Wymagani ludzie i j_eden zasСb"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Czas p_ocz╠tku spotkania:"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Czas _koЯca spotkania:"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr ""
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Teraz"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Dzi╤"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr ""
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr ""
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "_Wyszukiwanie"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grupa %i"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Delete Contact?"
+#~ msgstr "Usun╠Ф kontakt?"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
+#~ msgid "Address _2:"
+#~ msgstr "Adres _2:"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#, fuzzy
+#~ msgid "Canada"
+#~ msgstr "Terminarz"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "_Plik..."
+#~ msgid "Countr_y:"
+#~ msgstr "_Kraj:"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "_Czcionka..."
+#, fuzzy
+#~ msgid "Finland"
+#~ msgstr "Znajd╪"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr ""
+#~ msgid "_Address:"
+#~ msgstr "_Adres:"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#~ msgid "_City:"
+#~ msgstr "_Miasto:"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr ""
+#~ msgid "_State/Province:"
+#~ msgstr "_Stan/Prowincja:"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "Dodaj ╪rСdЁo"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "Znajd╪..."
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "Message Recipients"
+#~ msgstr "Odbiorcy listu"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr ""
+#~ msgid "Select Names"
+#~ msgstr "Wybierz nazw"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "_Nowy termin"
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "Wybierz nazwЙ z listy:"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#, fuzzy
+#~ msgid "a"
+#~ msgstr "am"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "_Akapit..."
+#, fuzzy
+#~ msgid "e"
+#~ msgstr "╕r"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "P_isownia..."
+#, fuzzy
+#~ msgid "f"
+#~ msgstr "Lista warunkСw"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#, fuzzy
+#~ msgid "i"
+#~ msgstr "jest"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#, fuzzy
+#~ msgid "k"
+#~ msgstr "Ok"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#, fuzzy
+#~ msgid "m"
+#~ msgstr "am"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr ""
+#, fuzzy
+#~ msgid "o"
+#~ msgstr "Po"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Znajd╪ ponownie"
+#, fuzzy
+#~ msgid "p"
+#~ msgstr "pm"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Znajd╪ p_onownie"
+#, fuzzy
+#~ msgid "r"
+#~ msgstr "Pt"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Przechodzi do nastЙpnego elementu"
+#, fuzzy
+#~ msgid "s"
+#~ msgstr "jest"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Przechodzi do poprzedniego elementu"
+#, fuzzy
+#~ msgid "t"
+#~ msgstr "."
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Modyfikuje wЁa╤ciwo╤ci pliku"
+#, fuzzy
+#~ msgid "u"
+#~ msgstr "Ni"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "_NastЙpny"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10-punktowa Tahoma"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Wklej"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8-ounktowa Tahoma"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Wkleja zawarto╤Ф schowka"
+#~ msgid "Body"
+#~ msgstr "Tre╤Ф"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Poprzedni"
+#~ msgid "Bottom:"
+#~ msgstr "DСЁ:"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Poprzedni"
+#~ msgid "Dimensions:"
+#~ msgstr "Wymiary:"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Ustawienia _wydruku..."
+#~ msgid "Font..."
+#~ msgstr "Czcionka..."
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Ustawienia wydruku"
+#~ msgid "Fonts"
+#~ msgstr "Czcionki"
 
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "WЁa╤ciwo╤ci"
+#~ msgid "Footer:"
+#~ msgstr "Stopka:"
 
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "PonСw"
+#~ msgid "Header"
+#~ msgstr "GЁСwka"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Ponawia cofniЙt╠ czynno╤Ф"
+#~ msgid "Header/Footer"
+#~ msgstr "GЁСwka/Stopka"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Zast╠p"
+#~ msgid "Height:"
+#~ msgstr "Wysoko╤Ф:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "ZastЙpuje napis"
+#~ msgid "Landscape"
+#~ msgstr "Pejza©"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Zapisuje termin i zamyka okno"
+#~ msgid "Left:"
+#~ msgstr "Lewy:"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Zapisuje bie©╠cy plik"
+#~ msgid "Letter tabs on side"
+#~ msgstr "ZakЁadki liter z boku"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#~ msgid "Margins"
+#~ msgstr "Marginesy"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#~ msgid "Number of columns:"
+#~ msgstr "Liczba kolumn:"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "Options"
+#~ msgstr "Opcje"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Ponownie wyszukuje ten sam napis"
+#~ msgid "Orientation"
+#~ msgstr "UЁo©enie"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Wyszukuje napis"
+#~ msgid "Page"
+#~ msgstr "Strona"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Zaznacz wszystkie"
+#~ msgid "Paper"
+#~ msgstr "Papier"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Zaznacza wszystko"
+#~ msgid "Paper source:"
+#~ msgstr "╛rСdЁo papieru:"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#~ msgid "Portrait"
+#~ msgstr "Portret"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Cofnij"
+#~ msgid "Preview:"
+#~ msgstr "Podgl╠d:"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Cofa ostatni╠ czynno╤Ф"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Odwrotnie na stronach parzystych"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_Informacje o..."
+#~ msgid "Right:"
+#~ msgstr "Prawy:"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Zamknij"
+#~ msgid "Sections:"
+#~ msgstr "Sekcje:"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Kopiuj"
+#~ msgid "Start on a new page"
+#~ msgstr "Rozpoczynanie na nowej stronie"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "Style name:"
+#~ msgstr "Nazwa stylu:"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Edycja"
+#~ msgid "Top:"
+#~ msgstr "GСra:"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Znajd╪..."
+#~ msgid "Type:"
+#~ msgstr "Typ:"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr ""
+#~ msgid "Width:"
+#~ msgstr "Szeroko╤Ф:"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "Pomo_c"
+#~ msgid "label26"
+#~ msgstr "etykieta26"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Wstaw"
+#, fuzzy
+#~ msgid "Calendar Server"
+#~ msgstr "Terminarz"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Obiekt"
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
 
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "Wk_lej"
+#~ msgid "Edit appointment"
+#~ msgstr "Modyfikuj termin"
+
+#, fuzzy
+#~ msgid "05 minutes"
+#~ msgstr "minut"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Drukuj"
+#, fuzzy
+#~ msgid "10 minutes"
+#~ msgstr "minut"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_WЁa╤ciwo╤ci..."
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12-godzinny (am/pm)"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "_PonСw"
+#, fuzzy
+#~ msgid "15 minutes"
+#~ msgstr "minut"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Zast╠p..."
+#~ msgid "24 hour"
+#~ msgstr "24-godzinny"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr ""
+#, fuzzy
+#~ msgid "30 minutes"
+#~ msgstr "minut"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Cofnij"
+#, fuzzy
+#~ msgid "60 minutes"
+#~ msgstr "minut"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "UtwСrz"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "SygnaЁ d╪wiЙkowy przy pojawianiu siЙ okien alarmu."
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Tworzy nowy list"
+#~ msgid "Calendar"
+#~ msgstr "Terminarz"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Kopiuje list do nowego foldera"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Ustawienia termiarza"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Folder"
+#~ msgid "Colors"
+#~ msgstr "Kolory"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "UtwСrz filtr w oparciu o n_adawcЙ"
+#~ msgid "Compress weekends"
+#~ msgstr "Kompresowanie weekendСw"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "UtwСrz filtr w oparciu o o_dbiorcСw"
+#~ msgid "Date navigator options"
+#~ msgstr "Opcje wyboru daty"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Zapomnij _hasЁa"
+#~ msgid "Defaults"
+#~ msgstr "Domy╤lne"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Pobierz"
+#~ msgid "Display options"
+#~ msgstr "Opcje wy╤wietlania"
+
+#~ msgid "End of day:"
+#~ msgstr "Koniec dnia:"
+
+#~ msgid "First day of week:"
+#~ msgstr "Pierwszy dzieЯ tygodnia:"
+
+#~ msgid "Pick a color"
+#~ msgstr "WybСr koloru"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Wy╤wietlanie numerСw tygodni"
+
+#~ msgid "Start of day:"
+#~ msgstr "Pocz╠tek dnia:"
+
+#~ msgid "Time divisions:"
+#~ msgstr "PrzedziaЁy czasu:"
+
+#~ msgid "Time format:"
+#~ msgstr "Format czasu:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmy wizualne"
+
+#~ msgid "Work week"
+#~ msgstr "TydzieЯ roboczy"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% _zakoЯczenia:"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Data zakoЯczenia:"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Drukuje list"
+#~ msgid "High"
+#~ msgstr "Wysoko╤Ф:"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "PrzesЁany list:\n"
+#~ msgid "Low"
+#~ msgstr "teraz"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Drukuje list"
+#~ msgid "Not Started"
+#~ msgstr "_Rozpoczynanie"
+
+#~ msgid "Task"
+#~ msgstr "Zadanie"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontakty..."
+
+#~ msgid "_Priority:"
+#~ msgstr "_Priorytety:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Stan:"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Wydarzenie _caЁodniowe"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Podstawowe elementy"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Dowolna powtarzalno╤Ф"
+
+#~ msgid "Days"
+#~ msgstr "Dni"
+
+#~ msgid "Exceptions"
+#~ msgstr "Wyj╠tki"
+
+#~ msgid "Hours"
+#~ msgstr "Godziny"
+
+#~ msgid "Mail _to:"
+#~ msgstr "_Adresat listu:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuty"
+
+#~ msgid "Modify"
+#~ msgstr "ZmieЯ"
+
+#~ msgid "No recurrence"
+#~ msgstr "Brak powtarzalno╤ci"
+
+#~ msgid "Preview"
+#~ msgstr "Podgl╠d"
+
+#~ msgid "Pri_vate"
+#~ msgstr "P_rywatny"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_bliczny"
+
+#~ msgid "Recurrence"
+#~ msgstr "Powtarzalno╤Ф"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "ReguЁa powtarzalno╤ci"
+
+#~ msgid "Reminder"
+#~ msgstr "Przypominanie"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Prosta powtarzalno╤Ф"
+
+#~ msgid "Time"
+#~ msgstr "Czas"
+
+#~ msgid "_Audio"
+#~ msgstr "_D╪wiЙk"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Tajny"
+
+#~ msgid "_Mail"
+#~ msgstr "_List"
+
+#~ msgid "_Program"
+#~ msgstr "_Program"
+
+#~ msgid "_Run program:"
+#~ msgstr "U_ruchomiany program:"
+
+#~ msgid "_Start time:"
+#~ msgstr "Czas _rozpoczЙcia:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Czas _rozpoczЙcia:"
+
+#~ msgid "day(s)"
+#~ msgstr "dzieЯ/dni"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "label21"
+#~ msgstr "etykieta21"
+
+#~ msgid "month(s)"
+#~ msgstr "miesiЙcy"
+
+#~ msgid "week(s)"
+#~ msgstr "tygodni"
+
+#~ msgid "year(s)"
+#~ msgstr "lat"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "_Filtry listСw..."
+#~ msgid "April"
+#~ msgstr "kwiecieЯ"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Opis:"
+#~ msgid "August"
+#~ msgstr "sierpieЯ"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "Oznacz jako p_rzeczytany"
+#, fuzzy
+#~ msgid "December"
+#~ msgstr "grudzieЯ"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Oznacz jako _nieprzeczytany"
+#, fuzzy
+#~ msgid "February"
+#~ msgstr "luty"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Przenie╤"
+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "Przejd╪ do daty:"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Przenosi list do nowego foldera"
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Przejd╪ do dnia dzisiejszego"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "styczeЯ"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Podgl╠d wydruku listu..."
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "lipiec"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Drukuje list na drukarce"
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "czerwiec"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Wydrukuj list..."
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "marzec"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Odpowiedz _wszystkim"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "PoniedziaЁek"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Odpowiedz _nadawcy"
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "listopad"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Zaznacz _wszystkie"
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "pa╪dziernik"
+
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "wrzesieЯ"
+
+#~ msgid "Attachment properties"
+#~ msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "WysyЁa listy w kolejce i pobiera nowe"
+#~ msgid "File name:"
+#~ msgstr "Nazwa pliku:"
+
+#~ msgid "MIME type:"
+#~ msgstr "Typ MIME:"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Modyfikacja VFolderСw"
+
+#~ msgid "Filter Rules"
+#~ msgstr "ReguЁy filtrСw"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Wy╤wietl wszystkie"
+#~ msgid "Outgoing"
+#~ msgstr "Obrys:"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "Wy╤wietlanie listСw z wyodrЙbnieniem w╠tkСw"
+#~ msgid "Virtual Folders"
+#~ msgstr "Wirtualne foldery"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "UtwСrz VFolder w oparciu o _nadawcЙ"
+#~ msgid "vFolder Sources"
+#~ msgstr "╛rСdЁa VFolderСw"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "UtwСrz VFolder w oparciu o _odbiorcСw"
+#~ msgid "Save"
+#~ msgstr "Zapisz"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Wy╤wietl wszystkie"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Zastosuj filtry"
+#, fuzzy
+#~ msgid "Hide selected"
+#~ msgstr "UsuniЙty"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Skonfiguruj folder"
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "Ukryj"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "_Skopiuj do foldera..."
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "UsuniЙty"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Zredaguj list"
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Temat"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Wyczy╤Ф"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "UtwСrz filtr w oparciu o nadawcЙ"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "UtwСrz filtr w oparciu o t_emat"
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Wydrukuj list"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "_Prze╤lij"
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Nie mo©na uruchomiФ wombata"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_OdwrСФ zaznaczenie"
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Format czasu:"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "Konfiguracja _listСw"
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_List"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Nie skonfigurowano ©adnych ╪rСdeЁ listСw"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "P_rzenie╤ do foldera..."
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Brak informacji"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_OtwСrz w nowym oknie"
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Drukuj list"
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Zaawansowane..."
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Zapisz jako..."
+#~ msgid "Authentication"
+#~ msgstr "Uwierzytelnianie:"
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "╛_rСdЁo"
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "Uwierzytelnianie:"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "Z _w╠tkami"
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "bez usuwania listСw z serwera"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "_Cofnij usuniЙcie"
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Brak"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "UtwСrz VFolder w oparciu o _temat"
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "Adres e-mail:"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Edytor _wirtualnych folderСw..."
+#~ msgid "Email Address:"
+#~ msgstr "Adres e-mail:"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "ZaЁ╠cz"
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Konfiguracja poczty"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Zamyka bie©╠cy plik"
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "PeЁna nazwa:"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "List zaszyfrowany"
+#~ msgid "Hostname:"
+#~ msgstr "nazwa u©ytkownika:"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
+#~ msgid "Identity"
+#~ msgstr "Dane osobowe"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Wstaw plik tekstowy.."
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
 
-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Otwiera plik"
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_List"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "E-mail zawiera"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Mail Configuration"
+#~ msgstr "Konfiguracja poczty"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Zapisz jako"
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Konfiguracja poczty"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "Nowy"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "Zapisz do foldera..."
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Opcje"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
+#~ msgid "Organization:"
+#~ msgstr "Organizacja:"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Zapisuje list w podanym folderze"
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "HasЁo"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Wy╤lij"
+#, fuzzy
+#~ msgid "Reply-to:"
+#~ msgstr "Odpowiedz"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Wy╤lij pС╪_niej"
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "_Wymagani ludzie"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Wy╤lij pС╪_niej"
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Zapisz jako VCard"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr ""
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Plik z podpisem:"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr ""
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "Konfiguracja poczty"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr ""
+#, fuzzy
+#~ msgid "Server Type: "
+#~ msgstr "Serwer:"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "Natychmiast wysyЁa wiadomo╤Ф"
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Serwer:"
 
-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "Wy╤wietla / ukrywa zaЁ╠czniki"
+#~ msgid "Signature file:"
+#~ msgstr "Plik z podpisem:"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Wy╤wietlanie _zaЁ╠cznikСw"
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Plik z podpisem:"
 
-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "PrzeЁ╠cza wy╤wietlanie zaЁ╠cznikСw"
+#~ msgid "Sources"
+#~ msgstr "╛rСdЁa"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "WysyЁanie listu bez tematu"
+#~ msgid "Type"
+#~ msgstr "Typ:"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "User Information"
+#~ msgstr "Brak informacji"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_OtwСrz..."
+#~ msgid "Username:"
+#~ msgstr "nazwa u©ytkownika:"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "minute(s)"
+#~ msgstr "minut"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#~ msgid "Full name:"
+#~ msgstr "PeЁna nazwa:"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Od╤wie© listЙ"
+#~ msgid "Email address:"
+#~ msgstr "Adres e-mail:"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Od╤wie©a listЙ folderСw"
+#~ msgid "Signature File"
+#~ msgstr "Plik z podpisem"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#~ msgid "Server:"
+#~ msgstr "Serwer:"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Zapisz"
+#~ msgid "Detect supported types..."
+#~ msgstr "Wykryj obsЁugiwane typy..."
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Wypisz"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "bez usuwania listСw z serwera"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Wy╤wietla inny folder"
+#~ msgid "Test Settings"
+#~ msgstr "Przetestuj ustawienia"
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "Za_koЯcz"
+#~ msgid "Mail source type:"
+#~ msgstr "Typ ╪rСdЁa listСw:"
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr ""
+#~ msgid "Add Source"
+#~ msgstr "Dodaj ╪rСdЁo"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "KoЯczy pracЙ programu"
+#~ msgid "Edit Source"
+#~ msgstr "Zmodyfikuj ╪rСdЁo"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "_Rozpoczynanie"
+#~ msgid "Testing \"%s\""
+#~ msgstr "Testowanie \"%s\""
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Wy╤wietla informacje o Evolution"
+#~ msgid "The connection was successful!"
+#~ msgstr "PoЁ╠czenie zakoЯczyЁo siЙ powodzeniem!"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Wy╤wietlanie paska f_olderСw"
+#~ msgid "Address"
+#~ msgstr "Adres"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Wy╤wietlanie paska _skrСtСw"
+#~ msgid "Mail Sources"
+#~ msgstr "╛rСdЁa listСw"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "OpС╪nienie oznaczania listu jako widzianego [ms]: "
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "WysyЁanie listСw w formacie HTML"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "W tej kopii Evolution nie jest dostЙpna obsЁuga GPG/PGP"
+
+#~ msgid "Create a new contact"
+#~ msgstr "Tworzy nowy kontakt"
+
+#~ msgid "Delete a contact"
+#~ msgstr "UsuЯ kontakt"
+
+#~ msgid "Find"
+#~ msgstr "Znajd╪"
+
+#~ msgid "Find a contact"
+#~ msgstr "Odnajduje kontakt"
+
+#~ msgid "Print contacts"
+#~ msgstr "Drukuj kontakty"
+
+#~ msgid "Stop"
+#~ msgstr "Zatrzymaj"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Zatrzymuje wczytywanie"
+
+#~ msgid "View All"
+#~ msgstr "Wy╤wietl wszystkie"
+
+#~ msgid "View all contacts"
+#~ msgstr "Wy╤wietla wszystkie kontakty"
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Konfiguracja _listСw"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "PrzeЁ╠cza wy╤wietlanie paska folderСw"
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Drukuj kontakty..."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "PrzeЁ╠cza wy╤wietlanie paska skrСtСw"
+#~ msgid "_Search for contacts"
+#~ msgstr "_Szukaj kontaktСw"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr ""
+#, fuzzy
+#~ msgid "Ca_lendar"
+#~ msgstr "Terminarz"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr ""
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Ustawienia terminarza..."
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Informacje o Evolution..."
+#~ msgid "Create a new appointment"
+#~ msgstr "Tworzy nowy termin"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Termin (FIXME)"
+#~ msgid "Create a new calendar"
+#~ msgstr "Tworzy nowy termianrz"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
+#~ msgid "Day"
+#~ msgstr "DzieЯ"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Folder"
+#~ msgid "Go back in time"
+#~ msgstr "Przemieszcza w czasie do tyЁu"
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "_Przejd╪ do foldera..."
+#~ msgid "Go forward in time"
+#~ msgstr "Przemieszcza w czasie do przodu"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Indeks"
+#~ msgid "Go to"
+#~ msgstr "Przejd╪"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#~ msgid "Go to a specific date"
+#~ msgstr "Przemieszcza do podanej daty"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_Ustawienia"
+#~ msgid "Go to present time"
+#~ msgstr "Przemieszcza do bie©╠cego czasu"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_Zadanie (FIXME)"
+#~ msgid "Month"
+#~ msgstr "Miesi╠c"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#~ msgid "Open a calendar"
+#~ msgstr "Otwiera terminarz"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#~ msgid "Prev"
+#~ msgstr "Poprzedni"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "ZajЙty"
+#~ msgid "Print this calendar"
+#~ msgstr "Drukuje terminarz"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Poza biurem"
+#~ msgid "Save calendar as something else"
+#~ msgstr "Zapisuje terminarz w innej formie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Brak informacji"
+#~ msgid "Show 1 day"
+#~ msgstr "Wy╤wietla jeden dzieЯ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#~ msgid "Show 1 month"
+#~ msgstr "Wy╤wietla jeden miesi╠c"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcje"
+#~ msgid "Show 1 week"
+#~ msgstr "Wy╤wietla jeden tydzieЯ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Wy╤wietlanie _tylko godzin roboczych"
+#~ msgid "Show the working week"
+#~ msgstr "Wy╤wietla tydzieЯ roboczy"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#~ msgid "Week"
+#~ msgstr "TydzieЯ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#~ msgid "_New"
+#~ msgstr "_Nowy"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "_Open Calendar"
+#~ msgstr "_OtwСrz terminarz"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "_Save As..."
+#~ msgstr "Zapisz j_ako..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "Delete this item"
+#~ msgstr "Usuwa bie©╠cy element"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Wszyscy ludzie i zasoby"
+#~ msgid "Delete..."
+#~ msgstr "UsuЯ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Wszyscy _ludzie i jeden zasСb"
+#~ msgid "Help"
+#~ msgstr "Pomoc"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Wymagani ludzie"
+#~ msgid "Print this item"
+#~ msgstr "Drukuje bie©╠cy element"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Wymagani ludzie i j_eden zasСb"
+#~ msgid "Print..."
+#~ msgstr "Drukuj..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Czas p_ocz╠tku spotkania:"
+#~ msgid "Save _As..."
+#~ msgstr "Zapisz j_ako..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Czas _koЯca spotkania:"
+#~ msgid "Save and Close"
+#~ msgstr "Zapisz i zamknij"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#~ msgid "_File"
+#~ msgstr "_Plik"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "_Print..."
+#~ msgstr "_Drukuj..."
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "_Save"
+#~ msgstr "_Zapisz"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Teraz"
+#~ msgid "About this application"
+#~ msgstr "Informacje o aplikacji"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "About..."
+#~ msgstr "Informacje o..."
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "C_lear"
+#~ msgstr "Wyc_zy╤Ф"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupa %i"
+#~ msgid "C_ut"
+#~ msgstr "_Wytnij"
+
+#~ msgid "Clear"
+#~ msgstr "Wyczy╤Ф"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Czy╤ci zaznaczenie"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Zamyka termin"
+
+#~ msgid "Copy"
+#~ msgstr "Kopiuj"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiuje zaznaczenie"
+
+#~ msgid "Cut"
+#~ msgstr "Wytnij"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Wycina zaznaczenie"
+
+#~ msgid "Dump XML"
+#~ msgstr "Wypisz XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Wypisuje opis interfejsu u©ytkownika w XML-u"
+
+#~ msgid "Find Again"
+#~ msgstr "Znajd╪ ponownie"
+
+#~ msgid "Find _Again"
+#~ msgstr "Znajd╪ p_onownie"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Modyfikuje wЁa╤ciwo╤ci pliku"
+
+#~ msgid "N_ext"
+#~ msgstr "_NastЙpny"
+
+#~ msgid "Paste"
+#~ msgstr "Wklej"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Wkleja zawarto╤Ф schowka"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Ustawienia _wydruku..."
 
-#~ msgid "categories"
-#~ msgstr "kategorie"
+#~ msgid "Print Setup"
+#~ msgstr "Ustawienia wydruku"
+
+#~ msgid "Properties"
+#~ msgstr "WЁa╤ciwo╤ci"
+
+#~ msgid "Redo"
+#~ msgstr "PonСw"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Ponawia cofniЙt╠ czynno╤Ф"
+
+#~ msgid "Replace"
+#~ msgstr "Zast╠p"
+
+#~ msgid "Replace a string"
+#~ msgstr "ZastЙpuje napis"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Zapisuje termin i zamyka okno"
+
+#~ msgid "Save the current file"
+#~ msgstr "Zapisuje bie©╠cy plik"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Ponownie wyszukuje ten sam napis"
+
+#~ msgid "Search for a string"
+#~ msgstr "Wyszukuje napis"
+
+#~ msgid "Select All"
+#~ msgstr "Zaznacz wszystkie"
+
+#~ msgid "Select everything"
+#~ msgstr "Zaznacza wszystko"
+
+#~ msgid "Undo"
+#~ msgstr "Cofnij"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Cofa ostatni╠ czynno╤Ф"
+
+#~ msgid "_About..."
+#~ msgstr "_Informacje o..."
+
+#~ msgid "_Close"
+#~ msgstr "_Zamknij"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopiuj"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edycja"
+
+#~ msgid "_Find..."
+#~ msgstr "_Znajd╪..."
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_c"
+
+#~ msgid "_Paste"
+#~ msgstr "Wk_lej"
+
+#~ msgid "_Print"
+#~ msgstr "_Drukuj"
+
+#~ msgid "_Properties..."
+#~ msgstr "_WЁa╤ciwo╤ci..."
+
+#~ msgid "_Redo"
+#~ msgstr "_PonСw"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Zast╠p..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Cofnij"
+
+#~ msgid "Compose"
+#~ msgstr "UtwСrz"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Tworzy nowy list"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopiuje list do nowego foldera"
+
+#~ msgid "F_older"
+#~ msgstr "_Folder"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "UtwСrz filtr w oparciu o n_adawcЙ"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "UtwСrz filtr w oparciu o o_dbiorcСw"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Zapomnij _hasЁa"
+
+#~ msgid "Get Mail"
+#~ msgstr "Pobierz"
+
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Drukuje list"
+
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "PrzesЁany list:\n"
+
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Drukuje list"
+
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "_Filtry listСw..."
+
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Opis:"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Oznacz jako p_rzeczytany"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oznacz jako _nieprzeczytany"
+
+#~ msgid "Move"
+#~ msgstr "Przenie╤"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Przenosi list do nowego foldera"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Podgl╠d wydruku listu..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Drukuje list na drukarce"
+
+#~ msgid "Print message..."
+#~ msgstr "Wydrukuj list..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Odpowiedz _wszystkim"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Odpowiedz _nadawcy"
+
+#~ msgid "Select _All"
+#~ msgstr "Zaznacz _wszystkie"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "WysyЁa listy w kolejce i pobiera nowe"
+
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Wy╤wietl wszystkie"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Wy╤wietlanie listСw z wyodrЙbnieniem w╠tkСw"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "UtwСrz VFolder w oparciu o _nadawcЙ"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "UtwСrz VFolder w oparciu o _odbiorcСw"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Zastosuj filtry"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Skopiuj do foldera..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Zredaguj list"
+
+#~ msgid "_Expunge"
+#~ msgstr "_Wyczy╤Ф"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "UtwСrz filtr w oparciu o t_emat"
+
+#~ msgid "_Forward"
+#~ msgstr "_Prze╤lij"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_OdwrСФ zaznaczenie"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Konfiguracja _listСw"
+
+#~ msgid "_Message"
+#~ msgstr "_List"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "P_rzenie╤ do foldera..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_OtwСrz w nowym oknie"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Drukuj list"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Zapisz jako..."
+
+#~ msgid "_Source"
+#~ msgstr "╛_rСdЁo"
+
+#~ msgid "_Threaded"
+#~ msgstr "Z _w╠tkami"
+
+#~ msgid "_Undelete"
+#~ msgstr "_Cofnij usuniЙcie"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "UtwСrz VFolder w oparciu o _temat"
+
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Edytor _wirtualnych folderСw..."
+
+#~ msgid "Attach"
+#~ msgstr "ZaЁ╠cz"
+
+#~ msgid "Close the current file"
+#~ msgstr "Zamyka bie©╠cy plik"
+
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "List zaszyfrowany"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Wstaw plik tekstowy.."
+
+#~ msgid "Open a file"
+#~ msgstr "Otwiera plik"
+
+#~ msgid "Save As"
+#~ msgstr "Zapisz jako"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Zapisz do foldera..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Zapisuje list w podanym folderze"
+
+#~ msgid "Send"
+#~ msgstr "Wy╤lij"
+
+#~ msgid "Send _Later"
+#~ msgstr "Wy╤lij pС╪_niej"
+
+#~ msgid "Send _later"
+#~ msgstr "Wy╤lij pС╪_niej"
+
+#~ msgid "Send this message now"
+#~ msgstr "Natychmiast wysyЁa wiadomo╤Ф"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Wy╤wietla / ukrywa zaЁ╠czniki"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Wy╤wietlanie _zaЁ╠cznikСw"
+
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "WysyЁanie listu bez tematu"
+
+#~ msgid "_Open..."
+#~ msgstr "_OtwСrz..."
+
+#~ msgid "Refresh List"
+#~ msgstr "Od╤wie© listЙ"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Od╤wie©a listЙ folderСw"
+
+#~ msgid "Subscribe"
+#~ msgstr "Zapisz"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Wypisz"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Wy╤wietla inny folder"
+
+#~ msgid "E_xit"
+#~ msgstr "Za_koЯcz"
+
+#~ msgid "Exit the program"
+#~ msgstr "KoЯczy pracЙ programu"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_Rozpoczynanie"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Wy╤wietla informacje o Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Wy╤wietlanie paska f_olderСw"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
+
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "PrzeЁ╠cza wy╤wietlanie paska folderСw"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "PrzeЁ╠cza wy╤wietlanie paska skrСtСw"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Informacje o Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Termin (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Folder"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Przejd╪ do foldera..."
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "_Settings"
+#~ msgstr "_Ustawienia"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Zadanie (FIXME)"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Elementy nale©╠ce do tych kategorii:"
@@ -7356,9 +6677,6 @@ msgstr "Grupa %i"
 #~ msgid "Draft"
 #~ msgstr "Roboczy"
 
-#~ msgid "Flagged"
-#~ msgstr "Oznaczony"
-
 #~ msgid "Set Flag"
 #~ msgstr "Oznacz"
 
@@ -7389,8 +6707,5 @@ msgstr "Grupa %i"
 #~ 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 871187a71f..d807b4803a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tiago AntЦo <tiagoantao@bigfoot.com>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,202 +14,370 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Enviar a mensagem"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Enviar"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Cores"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Ir para a _pasta..."
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ir para o item anterior"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ir para o prСximo item"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Nova pasta"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr ""
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Novo"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Criar um novo contacto"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Component de correio: NЦo consegui inicializar Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 #, fuzzy
 msgid "Card: "
 msgstr "Carro"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "EndereГo"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -225,29 +393,18 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-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.
@@ -367,42 +524,33 @@ msgstr ""
 "Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
 "PersistStream"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "NЦo se consegui inicializar Bonobo"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-#, fuzzy
-msgid "Delete Contact?"
-msgstr "Apagar um contacto"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -413,7 +561,7 @@ msgid "_Add"
 msgstr "Adicionar"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
@@ -427,14 +575,7 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Adicionar"
 
@@ -498,7 +639,6 @@ msgid "C_ontacts..."
 msgstr "_Contacto"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -517,8 +657,6 @@ msgid "_Address..."
 msgstr "EndereГo"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr ""
 
@@ -564,24 +702,27 @@ msgid "No_tes:"
 msgstr "_Nota"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr ""
 
@@ -590,6 +731,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Carro"
 
@@ -599,28 +741,33 @@ msgstr "Empresa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "RDIS"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "TelemСvel"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Outro"
 
@@ -629,10 +776,12 @@ msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Bip"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "PrimАrio"
 
@@ -649,66 +798,16 @@ msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "Correio electrСnico 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "Correio electrСnico 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-#, fuzzy
-msgid "Address _2:"
-msgstr "EndereГo"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#, fuzzy
-msgid "Check Address"
-msgstr "EndereГo"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#, fuzzy
-msgid "Finland"
-msgstr "Encontrar"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#, fuzzy
-msgid "_Address:"
-msgstr "EndereГo"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/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.
@@ -765,12 +864,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como _Tabela"
 
@@ -795,30 +889,30 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "мcone_s pequenos"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrarА"
 
@@ -847,9 +941,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 #, fuzzy
 msgid "Password"
 msgstr "Esquecer _Senhas"
@@ -885,12 +979,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
@@ -910,12 +1002,10 @@ msgid "Search Scope:"
 msgstr "Ano"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaГЦo"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Caminho"
 
@@ -940,210 +1030,93 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 #, fuzzy
 msgid "Description:"
 msgstr "Nenhuma descriГЦo"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Adicionar Fonte"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Apagar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-#, fuzzy
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Find..."
-msgstr "Encontrar"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
-msgid "Message Recipients"
-msgstr "SituaГЦo das mensagens"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "Select Names"
-msgstr "_Items seleccionados"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "_Items seleccionados"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 #, fuzzy
 msgid "Search"
 msgstr "Ano"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Gravar como VCard"
 
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 #, fuzzy
-msgid "a"
-msgstr "am"
+msgid "Name"
+msgstr "Nome"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "b"
-msgstr "%b"
+msgid "Email"
+msgstr "Correio electrСnico 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
-#, fuzzy
-msgid "c"
-msgstr "Cc"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "OrganizaГЦo"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "e"
-msgstr "Qa"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
+msgid "Department"
+msgstr "Data"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 #, fuzzy
-msgid "k"
-msgstr "Ok"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
+msgid "Office"
+msgstr "Fora do escritСrio"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 #, fuzzy
-msgid "m"
-msgstr "am"
+msgid "Title"
+msgstr "_Pasta"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 #, fuzzy
-msgid "o"
-msgstr "Para"
+msgid "Manager"
+msgstr "Bip"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 #, fuzzy
-msgid "p"
-msgstr "pm"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr ""
+msgid "Nickname"
+msgstr "Nome"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 #, fuzzy
-msgid "r"
-msgstr "Sx"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr ""
+msgid "Spouse"
+msgstr "Fontes"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 #, fuzzy
-msgid "u"
-msgstr "Do"
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr ""
+msgid "Note"
+msgstr "Nenhuma"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gravar como VCard"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1152,200 +1125,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-#, fuzzy
-msgid "Body"
-msgstr "Hoje"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-#, fuzzy
-msgid "Font..."
-msgstr "Imprimir..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-#, fuzzy
-msgid "Fonts"
-msgstr "MЙs"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:15
-#, fuzzy
-msgid "Format"
-msgstr "F_ormato"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-#, fuzzy
-msgid "Header"
-msgstr "Ano"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:18
-#, fuzzy
-msgid "Headings"
-msgstr "CabeГalhos:"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:20
-#, fuzzy
-msgid "Height:"
-msgstr "CabeГalhos:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:26
-#, fuzzy
-msgid "Margins"
-msgstr "мcones _grandes"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:28
-#, fuzzy
-msgid "Options"
-msgstr "_OpГУes"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-#, fuzzy
-msgid "Orientation"
-msgstr "OrganizaГЦo"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-#, fuzzy
-msgid "Page"
-msgstr "Bip"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:32
-#, fuzzy
-msgid "Paper"
-msgstr "Bip"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-#, fuzzy
-msgid "Paper source:"
-msgstr "Fontes de correio"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-#, fuzzy
-msgid "Portrait"
-msgstr "Prioridade"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-#, fuzzy
-msgid "Preview:"
-msgstr "Prever impressЦo"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:39
-#, fuzzy
-msgid "Sections:"
-msgstr "Segundos"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#, fuzzy
-msgid "Shading"
-msgstr "CabeГalhos:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-#, fuzzy
-msgid "Size:"
-msgstr "Tamanho"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-#, fuzzy
-msgid "Start on a new page"
-msgstr "Enviar uma nova mensagem"
-
-#: addressbook/printing/e-contact-print.glade.h:43
-#, fuzzy
-msgid "Style name:"
-msgstr "Nome completo:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-#, fuzzy
-msgid "Top:"
-msgstr "Para:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1355,13 +1134,13 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1374,72 +1153,17 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Novo Ca_lendАrio"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Atalho para _barra do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 #, fuzzy
 msgid "Snooze"
 msgstr "Tamanho"
@@ -1450,25 +1174,25 @@ msgstr "Tamanho"
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Ficheiro nЦo encontrado"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Abrir calendАrio"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Gravar calendАrio"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1476,64 +1200,61 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 #, fuzzy
 msgid "Transparent"
 msgstr "Transportes"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1542,7 +1263,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1550,905 +1271,433 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:224
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "Dia"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Ver _anexos"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimir calendАrio"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "O URI que o calendАrio mostrarА"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 #, fuzzy
 msgid "No summary available."
 msgstr "Nenhum sumАrio"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-#, fuzzy
-msgid "Close"
-msgstr "Cores"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#, fuzzy
-msgid "Edit appointment"
-msgstr "_Editar Compromisso"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#, fuzzy
-msgid "05 minutes"
-msgstr "Minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "10 minutes"
-msgstr "Minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "12 hour (am/pm)"
-msgstr "12 horas (AM/PM)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "15 minutes"
-msgstr "Minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "24 hour"
-msgstr "24 horas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "30 minutes"
-msgstr "Minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "60 minutes"
-msgstr "Minutos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Audio Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Calendar"
-msgstr "Novo Ca_lendАrio"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Calendar Preferences"
-msgstr "PreferЙncias"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Cores"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Sex"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-#, fuzzy
-msgid "Friday"
-msgstr "Sex"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Seg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "SАb"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-#, fuzzy
-msgid "Saturday"
-msgstr "Domingo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "Show appointment end times"
-msgstr "Compromisso - %s"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#, fuzzy
-msgid "Show week numbers"
-msgstr "Mostrar 1 semana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#, fuzzy
-msgid "TaskPad"
-msgstr "_Tarefa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Qui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-#, fuzzy
-msgid "Thursday"
-msgstr "Hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-#, fuzzy
-msgid "Tuesday"
-msgstr "Hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#, fuzzy
-msgid "Visual Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Qua"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#, fuzzy
-msgid "Work week"
-msgstr "Semana"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#, fuzzy
-msgid "seconds."
-msgstr " segundos"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
+msgstr "Nenhum sumАrio"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "_Entrada diАria?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
 msgstr ""
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhuma"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Normal"
-msgstr "F_ormato"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#, fuzzy
-msgid "Not Started"
-msgstr "_ComeГando"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#, fuzzy
-msgid "S_ummary"
-msgstr "SumАrio"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#, fuzzy
-msgid "Task"
-msgstr "_Tarefa"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
-msgid "_Contacts..."
-msgstr "_Contacto"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr ""
+msgid "End Date"
+msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
-msgid "_Priority:"
-msgstr "Prioridade:"
+msgid "Start Date"
+msgstr "Hora de Мn_icio de encontro"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
-msgstr "Nenhum sumАrio"
-
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioridade"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "SumАrio"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "_Entrada diАria?"
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Transportes"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:166
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Open..."
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Apagar"
+
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Delete the task"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Apagar esta ocurrЙncia"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "Compromissos:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "DiasRascunhos"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "_Editar Compromisso"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:409
 #, fuzzy
-msgid "Exceptions"
-msgstr "_AcГУes"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Horas"
+msgid "on"
+msgstr "Seg"
 
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 #, fuzzy
-msgid "Mail _to:"
-msgstr "atalhos principais"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Minutos"
+msgid "day"
+msgstr "Hoje"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#, fuzzy
-msgid "Modify"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Preview"
-msgstr "Prever impressЦo"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#, fuzzy
-msgid "Pri_vate"
-msgstr "Activar"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "SumАrio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor.c:436
 #, fuzzy
-msgid "_End time:"
-msgstr "Hora de _fim de _encontro"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_Correio"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-#, fuzzy
-msgid "_Start time:"
-msgstr "Hora de Мn_icio de encontro"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "day(s)"
-msgstr "DiasRascunhos"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr ""
+msgid "Tuesday"
+msgstr "Hoje"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor.c:438
 #, fuzzy
-msgid "month(s)"
-msgstr "MЙs"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
+msgid "Thursday"
+msgstr "Hoje"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor.c:439
 #, fuzzy
-msgid "week(s)"
-msgstr "Semanas"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr ""
-
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "_Editar Compromisso"
+msgid "Friday"
+msgstr "Sex"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:440
 #, fuzzy
-msgid "on"
-msgstr "Seg"
+msgid "Saturday"
+msgstr "Domingo"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-#, fuzzy
-msgid "day"
-msgstr "Hoje"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Domingo"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "MЙs"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "h"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:696
 #, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
+msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "_Correio"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Hoje"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
-msgstr ""
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Seg"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "Ano"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Ter"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Segunda-feira"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Qua"
 
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Qui"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "Outro"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Sex"
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "SАb"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "NЦo se consegui inicializar Bonobo"
@@ -2643,10 +1892,15 @@ msgstr "Ano corrente (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendАrio"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Prever impressЦo"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "O URI que o calendАrio mostrarА"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2737,78 +1991,85 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Abrir calendАrio"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2824,40 +2085,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2869,25 +2131,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2895,13 +2157,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, 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)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2909,7 +2171,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2917,7 +2179,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3239,8 +2501,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3269,71 +2531,70 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -3382,131 +2643,124 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+msgid "RCPT TO response error: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3550,12 +2804,11 @@ msgid "attachment"
 msgstr "Anexo"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Remover"
 
@@ -3571,60 +2824,42 @@ msgstr "Adicionar anexo..."
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro Ю mensagem"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-#, fuzzy
-msgid "Attachment properties"
-msgstr "Propriedades do alarme"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-#, fuzzy
-msgid "File name:"
-msgstr "Nome completo:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 #, fuzzy
 msgid "From:"
 msgstr "De"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endereГos"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3632,11 +2867,11 @@ msgstr ""
 "Entre os endereГos que irЦo receber uma cСpia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Introduza o assunto da carta"
 
@@ -3647,94 +2882,90 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Enviar uma nova mensagem"
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Enviar uma nova mensagem"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, 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 "year"
@@ -3872,7 +3103,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr ""
 
@@ -3978,204 +3209,183 @@ msgstr ""
 msgid "Read"
 msgstr "Remover"
 
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid "Edit VFolders"
-msgstr "_Pastas"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-#, fuzzy
-msgid "Virtual Folders"
-msgstr "_Pastas"
-
-#: filter/filter.glade.h:16
-#, fuzzy
-msgid "vFolder Sources"
-msgstr "Adicionar Fonte"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "after"
-msgstr "Data"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "contains"
-msgstr "_AcГУes"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:11
-msgid "does not contain"
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
 msgstr ""
 
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Forward to Address"
+msgstr "Enviar esta mensagem"
+
+#: filter/libfilter-i18n.h:10
+#, fuzzy
+msgid "Message Body"
+msgstr "SituaГЦo das mensagens"
+
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "SituaГЦo das mensagens"
+
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr ""
+#, fuzzy
+msgid "Message was sent"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro nЦo encontrado"
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr ""
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Score"
+msgstr "Fontes"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Enviar esta mensagem"
+msgid "Set Status"
+msgstr "SituaГЦo online"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "SАb"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Message Body"
-msgstr "SituaГЦo das mensagens"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Assunto"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "Message Header"
-msgstr "SituaГЦo das mensagens"
+msgid "after"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "Message was sent"
-msgstr "SituaГЦo das mensagens"
+msgid "contains"
+msgstr "_AcГУes"
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
+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 "Recipients"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "SituaГЦo online"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "SАb"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Assunto"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4194,11 +3404,6 @@ msgstr "Adicionar Fonte"
 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 ""
@@ -4207,222 +3412,172 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
+#: mail/folder-browser.c:225
 #, fuzzy
-msgid "Save"
-msgstr "SА"
+msgid "Store search as vFolder"
+msgstr "_Nova pasta"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 #, fuzzy
 msgid "Subject contains"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr ""
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr ""
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Apagar"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Assunto"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Ficheiro nЦo encontrado"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr ""
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, fuzzy
 msgid "Undelete"
 msgstr "Apagar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Create Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Encontrar mensagens"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Assunto"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "NЦo se consegui inicializar Bonobo"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Nenhuma"
 
-#: mail/local-config.glade.h:7
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "Mailbox Format"
-msgstr "F_ormato"
+msgid " (default)"
+msgstr "Apagar"
 
-#: mail/local-config.glade.h:8
-msgid "New store format:"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/mail-account-editor.c:274
 msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-#, fuzzy
-msgid "mbox"
-msgstr "Correio novo"
-
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Atalho para _barra do Evolution"
 
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
@@ -4444,7 +3599,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4452,542 +3607,113 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Nenhuma InformaГЦo"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Propriedades do alarme"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Adicionar..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "AutenticaГЦo"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "AutenticaГЦo"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Apagar"
-
-#: mail/mail-config-druid.glade.h:26
-msgid "Delete mail from server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Nenhuma"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "EndereГo de correio:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "EndereГo de correio:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraГЦo do correio"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Utilizador:"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_Correio"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "мcone_s pequenos"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "ConfiguraГЦo do correio"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "ConfiguraГЦo do correio"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Novo"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "_OpГУes"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganizaГЦo:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "Esquecer _Senhas"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Responder"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "Pessoas _NecessЦrias"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Gravar como VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Enviar"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "ConfiguraГЦo do correio"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Servidor:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Servidor:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Nenhuma InformaГЦo"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Utilizador:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "Minutos"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "EndereГo de correio:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr ""
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Servidor:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-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
-#, fuzzy
-msgid "Mail source type:"
-msgstr "Fontes de correio"
-
-#: mail/mail-config-gui.c:1135
-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: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"
-"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
-#, fuzzy
-msgid "Mail transport type:"
-msgstr "Transporte de correio"
-
-#: mail/mail-config-gui.c:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr ""
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Adicionar Fonte"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr ""
-
-#: mail/mail-config-gui.c:1430
-#, fuzzy
-msgid "Add News Server"
-msgstr "Adicionar novo grupo"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr ""
-
-#: mail/mail-config-gui.c:2253
+#: mail/mail-config-druid.c:363
 #, 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 ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "EndereГo"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Mail Sources"
-msgstr "atalhos principais"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte de correio"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr ""
-
-#: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "News Servers"
-msgstr "Servidor:"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "News Sources"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "OrganizaГЦo"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Enviar mensagem em formato HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Criar um novo calendАrio"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5023,66 +3749,67 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Responder"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5142,7 +3869,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5168,163 +3895,163 @@ msgstr ""
 msgid "Working"
 msgstr "Seg"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 #, fuzzy
 msgid "(No description)"
 msgstr "Nenhuma descriГЦo"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sincronizar"
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5335,7 +4062,7 @@ msgstr "Erro a gravar os atalhos."
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5441,116 +4168,195 @@ msgstr "_Nova pasta"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Reponder a todos receptores da mensagem"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 #, fuzzy
 msgid "Forward this message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 #, fuzzy
 msgid "Delete this message"
 msgstr "Enviar esta mensagem"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "De"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Data"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Receber"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "Para:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Tamanho"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Criar um novo calendАrio"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "_Pastas"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Fontes"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5648,30 +4454,31 @@ msgstr ""
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sem tМtulo)"
 
-#: shell/e-shell-view-menu.c:111
+#: 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."
 
-#: shell/e-shell-view-menu.c:117
+#: 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:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
@@ -5679,13 +4486,18 @@ msgstr "Ir para a _pasta..."
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "_Pastas"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5693,81 +4505,91 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 #, fuzzy
 msgid "_Small Icons"
 msgstr "мcone_s pequenos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co Мcones grandes"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 #, fuzzy
 msgid "_Remove This Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Mostrar barra de atalho_s"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activar este atalho"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
@@ -5775,13 +4597,12 @@ msgstr "Remover este atalho da barra de atalhos"
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem seleccionada"
@@ -5875,1333 +4696,1429 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializaГЦo do sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Criar um novo contacto"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Compromisso"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Apagar um contacto"
+#: ui/evolution-contact-editor.xml:8
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "Pedido de _encontro"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Encontrar"
+#: ui/evolution-contact-editor.xml:10
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Encontrar um contacto"
+#: ui/evolution-contact-editor.xml:11
+#, fuzzy
+msgid "FIXME: _Contact"
+msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Novo"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:13
+#, fuzzy
+msgid "FIXME: Task _Request"
+msgstr "_Pedido de tarefa"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Imprimir contactos"
+#: ui/evolution-contact-editor.xml:14
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "_Entrada diАria?"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "View all contacts"
-msgstr "Encontrar um contacto"
+msgid "FIXME: Define Print _Styles..."
+msgstr "Pedido de _encontro"
 
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "ConfiguraГЦo do co_rreio..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-contact-editor.xml:35
 #, fuzzy
-msgid "_Print Contacts..."
-msgstr "Imprimir contactos"
+msgid "FIXME: Save Attac_hments..."
+msgstr "Adicionar anexo..."
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 Dias"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Alter preferences"
-msgstr "PreferЙncias"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:41
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Novo Ca_lendАrio"
+msgid "Page Set_up"
+msgstr "Imprimir"
 
-#: ui/evolution-calendar.xml.h:9
-#, fuzzy
-msgid "Calendar Preferences..."
-msgstr "PreferЙncias"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
+#: ui/evolution-contact-editor.xml:63
+msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Criar um novo calendАrio"
+#: ui/evolution-contact-editor.xml:68
+msgid "FIXME: Mark as U_nread"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dia"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objecto"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Ir para"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Ir para uma data especМfica"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "MЙs"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "_Contacto"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Abrir um calendАrio"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "An_terior"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr ""
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "PrС_ximo"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Imprimir este calendАrio"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Ferramentas"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Mostrar 1 dia"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Mostrar 1 mЙs"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Mostrar 1 semana"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Mostrar a semana de trabalho"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Semana"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Novo"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "Abrir Ca_lendАrio"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
-msgid "_Print this calendar"
-msgstr "Imprimir este calendАrio"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "Gravar na _pasta..."
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Apagar este item"
+#: ui/evolution-contact-editor.xml:137
+#, fuzzy
+msgid "_Forms"
+msgstr "_Pasta"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:142
 #, fuzzy
-msgid "Delete..."
-msgstr "Apagar"
+msgid "FIXME: _New Contact"
+msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml:145
 #, fuzzy
-msgid "Print En_velope..."
-msgstr "Imprimir..."
-
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Imprimir este item"
+msgid "FIXME: New _Letter to Contact"
+msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Imprimir..."
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-contact-editor.xml:147
 #, fuzzy
-msgid "Save _As..."
-msgstr "Gravar na _pasta..."
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "Save and Close"
-msgstr "Guardar CalendАrio como"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr ""
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "_Entrada diАria?"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Enviar mensagem em formato HTML"
-
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml:153
 #, fuzzy
-msgid "_File"
-msgstr "_Pasta"
+msgid "FIXME: _Display Map of Address"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml:154
 #, fuzzy
-msgid "_Print..."
-msgstr "Imprimir..."
+msgid "FIXME: _Open Web Page"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr ""
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormato"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "_AcГУes"
 
-#: ui/evolution-event-editor.xml.h:9
+#: ui/evolution-contact-editor.xml:246
 #, fuzzy
-msgid "C_lear"
-msgstr "Carro"
+msgid "FIXME: Previous"
+msgstr "An_terior"
 
-#: ui/evolution-event-editor.xml.h:10
-#, fuzzy
-msgid "C_ut"
-msgstr "Cortar"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Ir para o item anterior"
 
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-contact-editor.xml:249
 #, fuzzy
-msgid "Clear"
-msgstr "Carro"
+msgid "FIXME: Next"
+msgstr "_Contacto"
+
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Ir para o prСximo item"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
+#. 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:2471
+msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14
-#, fuzzy
-msgid "Close this appointment"
-msgstr "Novo compromisso"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Copiar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupado"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Fora do escritСrio"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Cortar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Nenhuma InformaГЦo"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_OpГУes"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
+#: 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 ""
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
+#: 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 ""
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28
-#, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "Pedido de _encontro"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Pessoas _NecessЦrias"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora de Мn_icio de encontro"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora de _fim de _encontro"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr ""
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+#, fuzzy
+msgid "Now"
+msgstr "Novo"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Hoje"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr ""
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grupo %i"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete Contact?"
+#~ msgstr "Apagar um contacto"
 
-#: ui/evolution-event-editor.xml.h:43
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Adicionar anexo..."
+#~ msgid "Address _2:"
+#~ msgstr "EndereГo"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#, fuzzy
+#~ msgid "Check Address"
+#~ msgstr "EndereГo"
 
-#: ui/evolution-event-editor.xml.h:45
 #, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "_Pedido de tarefa"
+#~ msgid "Finland"
+#~ msgstr "Encontrar"
 
-#: ui/evolution-event-editor.xml.h:46
 #, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_Contacto"
+#~ msgid "_Address:"
+#~ msgstr "EndereГo"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adicionar Fonte"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr ""
+#, fuzzy
+#~ msgid "Find..."
+#~ msgstr "Encontrar"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr ""
+#, fuzzy
+#~ msgid "Message Recipients"
+#~ msgstr "SituaГЦo das mensagens"
 
-#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "_Contacto"
+#~ msgid "Select Names"
+#~ msgstr "_Items seleccionados"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr ""
+#, fuzzy
+#~ msgid "Select name from:"
+#~ msgstr "_Items seleccionados"
 
-#: ui/evolution-event-editor.xml.h:52
 #, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "_Entrada diАria?"
+#~ msgid "a"
+#~ msgstr "am"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr ""
+#, fuzzy
+#~ msgid "b"
+#~ msgstr "%b"
 
-#: ui/evolution-event-editor.xml.h:54
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Mensagem de _correio"
+#~ msgid "c"
+#~ msgstr "Cc"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#, fuzzy
+#~ msgid "e"
+#~ msgstr "Qa"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr ""
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Compromisso"
+#~ msgid "k"
+#~ msgstr "Ok"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#, fuzzy
+#~ msgid "m"
+#~ msgstr "am"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr ""
+#, fuzzy
+#~ msgid "o"
+#~ msgstr "Para"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#, fuzzy
+#~ msgid "p"
+#~ msgstr "pm"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr ""
+#, fuzzy
+#~ msgid "r"
+#~ msgstr "Sx"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#, fuzzy
+#~ msgid "u"
+#~ msgstr "Do"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr ""
+#, fuzzy
+#~ msgid "Body"
+#~ msgstr "Hoje"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#, fuzzy
+#~ msgid "Font..."
+#~ msgstr "Imprimir..."
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#, fuzzy
+#~ msgid "Fonts"
+#~ msgstr "MЙs"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "F_ormato"
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "F_ormato"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Header"
+#~ msgstr "Ano"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "Headings"
+#~ msgstr "CabeГalhos:"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Ir para o prСximo item"
+#, fuzzy
+#~ msgid "Height:"
+#~ msgstr "CabeГalhos:"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Ir para o item anterior"
+#, fuzzy
+#~ msgid "Margins"
+#~ msgstr "мcones _grandes"
 
-#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propriedades"
+#~ msgid "Options"
+#~ msgstr "_OpГУes"
 
-#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "PrС_ximo"
+#~ msgid "Orientation"
+#~ msgstr "OrganizaГЦo"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Colar"
+#, fuzzy
+#~ msgid "Page"
+#~ msgstr "Bip"
 
-#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "Colar item da Аrea de transferЙncia"
+#~ msgid "Paper"
+#~ msgstr "Bip"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "An_terior"
+#, fuzzy
+#~ msgid "Paper source:"
+#~ msgstr "Fontes de correio"
 
-#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "An_terior"
+#~ msgid "Portrait"
+#~ msgstr "Prioridade"
 
-#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "Imprimir..."
+#~ msgid "Preview:"
+#~ msgstr "Prever impressЦo"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "Imprimir"
+#~ msgid "Sections:"
+#~ msgstr "Segundos"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "Propriedades do alarme"
+#~ msgid "Shading"
+#~ msgstr "CabeГalhos:"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "Remover"
+#~ msgid "Start on a new page"
+#~ msgstr "Enviar uma nova mensagem"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
+#, fuzzy
+#~ msgid "Style name:"
+#~ msgstr "Nome completo:"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "Responder"
+#~ msgid "Top:"
+#~ msgstr "Para:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Calendar Server"
+#~ msgstr "Novo Ca_lendАrio"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Atalho para _barra do Evolution"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
-msgid "Save the current file"
-msgstr "Ficheiro com assinatura:"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit appointment"
+#~ msgstr "_Editar Compromisso"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "05 minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "10 minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 horas (AM/PM)"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#, fuzzy
+#~ msgid "15 minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "Reponder para todos"
+#~ msgid "24 hour"
+#~ msgstr "24 horas"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
+#, fuzzy
+#~ msgid "30 minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#, fuzzy
+#~ msgid "60 minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Anular"
+#, fuzzy
+#~ msgid "Calendar"
+#~ msgstr "Novo Ca_lendАrio"
 
-#: ui/evolution-event-editor.xml.h:103
 #, fuzzy
-msgid "Undo the last action"
-msgstr "Anular a Зltima operaГЦo"
+#~ msgid "Calendar Preferences"
+#~ msgstr "PreferЙncias"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr ""
+#~ msgid "Colors"
+#~ msgstr "Cores"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
-msgid "_Close"
-msgstr "Cores"
+#~ msgid "Show week numbers"
+#~ msgstr "Mostrar 1 semana"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "Copiar"
+#~ msgid "TaskPad"
+#~ msgstr "_Tarefa"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#, fuzzy
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 #, fuzzy
-msgid "_Edit"
-msgstr "Editar..."
+#~ msgid "Work week"
+#~ msgstr "Semana"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "Encontrar"
+#~ msgid "seconds."
+#~ msgstr " segundos"
 
-#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
-msgid "_Forms"
-msgstr "_Pasta"
+#~ msgid "Normal"
+#~ msgstr "F_ormato"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr ""
+#, fuzzy
+#~ msgid "Not Started"
+#~ msgstr "_ComeГando"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_Inserir"
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "_Tarefa"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Objecto"
+#, fuzzy
+#~ msgid "_Contacts..."
+#~ msgstr "_Contacto"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "Colar"
+#~ msgid "_Priority:"
+#~ msgstr "Prioridade:"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "Imprimir"
+#~ msgid "Appointment Basics"
+#~ msgstr "Compromissos:"
+
+#~ msgid "Days"
+#~ msgstr "DiasRascunhos"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "Propriedades do alarme"
+#~ msgid "Exceptions"
+#~ msgstr "_AcГУes"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr ""
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr ""
+#, fuzzy
+#~ msgid "Mail _to:"
+#~ msgstr "atalhos principais"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_Ferramentas"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
-msgid "_Undo"
-msgstr "Anular"
+#~ msgid "Modify"
+#~ msgstr "Segunda-feira"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
 #, fuzzy
-msgid "Compose"
-msgstr "Cores"
+#~ msgid "Preview"
+#~ msgstr "Prever impressЦo"
 
-#: ui/evolution-mail.xml.h:7
 #, fuzzy
-msgid "Compose a new message"
-msgstr "Criar uma nova mensagem"
+#~ msgid "Pri_vate"
+#~ msgstr "Activar"
 
-#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "Su_mmary:"
+#~ msgstr "SumАrio:"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correio"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "_Pastas"
+#~ msgid "day(s)"
+#~ msgstr "DiasRascunhos"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#, fuzzy
+#~ msgid "month(s)"
+#~ msgstr "MЙs"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#, fuzzy
+#~ msgid "week(s)"
+#~ msgstr "Semanas"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Esquecer _Senhas"
+#, fuzzy
+#~ msgid "April"
+#~ msgstr "_Correio"
 
-#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Get Mail"
-msgstr "_Correio"
+#~ msgid "Go To Today"
+#~ msgstr "Hoje"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "March"
+#~ msgstr "Ano"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Novas mensagens de correio"
+#~ msgid "May"
+#~ msgstr "Segunda-feira"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "October"
+#~ msgstr "Outro"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "DruМda dos _filtros"
+#~ msgid "Attachment properties"
+#~ msgstr "Propriedades do alarme"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Manage Subscriptions..."
-msgstr ""
+#, fuzzy
+#~ msgid "File name:"
+#~ msgstr "Nome completo:"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit VFolders"
+#~ msgstr "_Pastas"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr ""
+#, fuzzy
+#~ msgid "Virtual Folders"
+#~ msgstr "_Pastas"
 
-#: ui/evolution-mail.xml.h:29
 #, fuzzy
-msgid "Move"
-msgstr "Sg"
+#~ msgid "vFolder Sources"
+#~ msgstr "Adicionar Fonte"
 
-#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Move message to a new folder"
-msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "Save"
+#~ msgstr "SА"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Apagar"
 
-#: ui/evolution-mail.xml.h:33
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Prever impressЦo"
+#~ msgid "Hide Subject"
+#~ msgstr "Assunto"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Ficheiro nЦo encontrado"
 
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "Encontrar mensagens"
+#~ msgid "Hide Messages"
+#~ msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail.xml.h:39
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Reponder para todos"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Assunto"
 
-#: ui/evolution-mail.xml.h:40
 #, fuzzy
-msgid "Reply to _Sender"
-msgstr "Reponder para todos"
+#~ msgid "Current store format:"
+#~ msgstr "NЦo se consegui inicializar Bonobo"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-msgid "Select _All"
-msgstr "Reponder para todos"
+#~ msgid "Mailbox Format"
+#~ msgstr "F_ormato"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#, fuzzy
+#~ msgid "mbox"
+#~ msgstr "Correio novo"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Novas mensagens de correio"
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr ""
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Nenhuma InformaГЦo"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Propriedades do alarme"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Adicionar..."
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "AutenticaГЦo"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr ""
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "AutenticaГЦo"
 
-#: ui/evolution-mail.xml.h:51
 #, fuzzy
-msgid "_Configure Folder"
-msgstr "_Nova pasta"
+#~ msgid "Done"
+#~ msgstr "Nenhuma"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "Ir para a _pasta..."
+#~ msgid "E-Mail Address:"
+#~ msgstr "EndereГo de correio:"
 
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "Mensagem de _correio"
+#~ msgid "Email Address:"
+#~ msgstr "EndereГo de correio:"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraГЦo do correio"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "Nome completo:"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr ""
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Utilizador:"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_Correio"
 
-#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration..."
-msgstr "ConfiguraГЦo do co_rreio..."
+#~ msgid "Mail Account"
+#~ msgstr "мcone_s pequenos"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraГЦo do correio"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "Mensagem de _correio"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "ConfiguraГЦo do correio"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "Ir para a _pasta..."
+#~ msgid "News"
+#~ msgstr "Novo"
 
-#: ui/evolution-mail.xml.h:62
 #, fuzzy
-msgid "_Open in New Window"
-msgstr "еbrir em nova janela"
+#~ msgid "Optional"
+#~ msgstr "_OpГУes"
+
+#~ msgid "Organization:"
+#~ msgstr "OrganizaГЦo:"
 
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "Encontrar mensagens"
+#~ msgid "Password:"
+#~ msgstr "Esquecer _Senhas"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr ""
+#, fuzzy
+#~ msgid "Reply-to:"
+#~ msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Fontes"
+#~ msgid "Required"
+#~ msgstr "Pessoas _NecessЦrias"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Gravar como VCard"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "Apagar"
+#~ msgid "Select signature file"
+#~ msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraГЦo do correio"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "_Pastas"
+#~ msgid "Server Type: "
+#~ msgstr "Servidor:"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Anexar"
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Servidor:"
+
+#~ msgid "Signature file:"
+#~ msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "Fechar o calendАrio corrente"
+#~ msgid "Signature:"
+#~ msgstr "Ficheiro com assinatura:"
+
+#~ msgid "Sources"
+#~ msgstr "Fontes"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Enviar a mensagem"
+#~ msgid "User Information"
+#~ msgstr "Nenhuma InformaГЦo"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "Utilizador:"
 
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Anexar um ficheiro Ю mensagem"
+#~ msgid "minute(s)"
+#~ msgstr "Minutos"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr ""
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
+
+#~ msgid "Email address:"
+#~ msgstr "EndereГo de correio:"
+
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Abrir ficheiro"
+#~ msgid "Mail source type:"
+#~ msgstr "Fontes de correio"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail transport type:"
+#~ msgstr "Transporte de correio"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#~ msgid "Add Source"
+#~ msgstr "Adicionar Fonte"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "Guardar CalendАrio como"
+#~ msgid "Add News Server"
+#~ msgstr "Adicionar novo grupo"
+
+#~ msgid "Address"
+#~ msgstr "EndereГo"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Gravar na _pasta..."
+#~ msgid "Mail Sources"
+#~ msgstr "atalhos principais"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte de correio"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Gravar na _pasta..."
+#~ msgid "News Servers"
+#~ msgstr "Servidor:"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr ""
+#, fuzzy
+#~ msgid "News Sources"
+#~ msgstr "Fontes"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Enviar"
+#~ msgid "Delete a contact"
+#~ msgstr "Apagar um contacto"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
+#~ msgid "Find"
+#~ msgstr "Encontrar"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
+#~ msgid "Find a contact"
+#~ msgstr "Encontrar um contacto"
+
+#~ msgid "Print contacts"
+#~ msgstr "Imprimir contactos"
 
-#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-msgid "Send the mail in HTML format"
-msgstr "Enviar mensagem em formato HTML"
+#~ msgid "View all contacts"
+#~ msgstr "Encontrar um contacto"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Enviar a mensagem"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "ConfiguraГЦo do co_rreio..."
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Enviar a mensagem"
+#~ msgid "_Print Contacts..."
+#~ msgstr "Imprimir contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dias"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Enviar esta mensagem"
+#~ msgid "Alter preferences"
+#~ msgstr "PreferЙncias"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Ver/esconder anexos"
+#~ msgid "Ca_lendar"
+#~ msgstr "Novo Ca_lendАrio"
 
-#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-msgid "Show _attachments"
-msgstr "Ver _anexos"
+#~ msgid "Calendar Preferences..."
+#~ msgstr "PreferЙncias"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Criar um novo calendАrio"
+
+#~ msgid "Go to"
+#~ msgstr "Ir para"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Ir para uma data especМfica"
+
+#~ msgid "Month"
+#~ msgstr "MЙs"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir um calendАrio"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Imprimir este calendАrio"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Mostrar 1 dia"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Mostrar 1 mЙs"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Mostrar 1 semana"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostrar a semana de trabalho"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_New"
+#~ msgstr "_Novo"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "Ver _anexos"
+#~ msgid "_Open Calendar"
+#~ msgstr "Abrir Ca_lendАrio"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Enviar esta mensagem"
+#~ msgid "_Print this calendar"
+#~ msgstr "Imprimir este calendАrio"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Save As..."
+#~ msgstr "Gravar na _pasta..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Apagar este item"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "_Abrir"
+#~ msgid "Delete..."
+#~ msgstr "Apagar"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Print En_velope..."
+#~ msgstr "Imprimir..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#~ msgid "Print this item"
+#~ msgstr "Imprimir este item"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Save _As..."
+#~ msgstr "Gravar na _pasta..."
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Save and Close"
+#~ msgstr "Guardar CalendАrio como"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "_Pasta"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print..."
+#~ msgstr "Imprimir..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Mostrar uma pasta diferente"
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "Carro"
 
-#: ui/evolution.xml.h:7
 #, fuzzy
-msgid "E_xit"
-msgstr "PrС_ximo"
+#~ msgid "C_ut"
+#~ msgstr "Cortar"
 
-#: ui/evolution.xml.h:8
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Atalho para _barra do Evolution"
+#~ msgid "Clear"
+#~ msgstr "Carro"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "Novo compromisso"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "_ComeГando"
+#~ msgid "Copy"
+#~ msgstr "Copiar"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr ""
+#~ msgid "Cut"
+#~ msgstr "Cortar"
 
-#: ui/evolution.xml.h:12
 #, fuzzy
-msgid "Show the _Folder Bar"
-msgstr "Mostrar a barra de pastas"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Compromisso"
 
-#: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Mostrar a barra de atalhos"
+#~ msgid "Modify the file's properties"
+#~ msgstr "Propriedades"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr ""
+#~ msgid "Paste"
+#~ msgstr "Colar"
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr ""
+#, fuzzy
+#~ msgid "Paste the clipboard"
+#~ msgstr "Colar item da Аrea de transferЙncia"
 
-#: ui/evolution.xml.h:16
 #, fuzzy
-msgid "Toggle whether to show the folder bar"
-msgstr "Mostrar a barra de pastas"
+#~ msgid "Print S_etup..."
+#~ msgstr "Imprimir..."
 
-#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Mostrar a barra de atalhos"
+#~ msgid "Properties"
+#~ msgstr "Propriedades do alarme"
 
-#: ui/evolution.xml.h:18
 #, fuzzy
-msgid "Using the C_ontact Manager"
-msgstr "Usando o programa de C_orreio"
+#~ msgid "Redo"
+#~ msgstr "Remover"
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Usando o _CalendАrio"
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Responder"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Usando o programa de C_orreio"
+#, fuzzy
+#~ msgid "Save the current file"
+#~ msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution.xml.h:21
 #, fuzzy
-msgid "_About Evolution..."
-msgstr "Evolution"
+#~ msgid "Select All"
+#~ msgstr "Reponder para todos"
+
+#~ msgid "Undo"
+#~ msgstr "Anular"
 
-#: ui/evolution.xml.h:22
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Compromisso"
+#~ msgid "Undo the last action"
+#~ msgstr "Anular a Зltima operaГЦo"
 
-#: ui/evolution.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_Contacto"
+#~ msgid "_Close"
+#~ msgstr "Cores"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Pasta"
+#, fuzzy
+#~ msgid "_Copy"
+#~ msgstr "Copiar"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "Ir para a _pasta..."
+#~ msgid "_Edit"
+#~ msgstr "Editar..."
 
-#: ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Index"
-msgstr "мnd_ice de ajuda"
+#~ msgid "_Find..."
+#~ msgstr "Encontrar"
 
-#: ui/evolution.xml.h:30
 #, fuzzy
-msgid "_Mail message (FIXME)"
-msgstr "Mensagem de _correio"
+#~ msgid "_Paste"
+#~ msgstr "Colar"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print"
+#~ msgstr "Imprimir"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr ""
+#, fuzzy
+#~ msgid "_Properties..."
+#~ msgstr "Propriedades do alarme"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "_Undo"
+#~ msgstr "Anular"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#, fuzzy
+#~ msgid "Compose"
+#~ msgstr "Cores"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
+#, fuzzy
+#~ msgid "Compose a new message"
+#~ msgstr "Criar uma nova mensagem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora do escritСrio"
+#, fuzzy
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Gravar a mensagem na pasta especificada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nenhuma InformaГЦo"
+#, fuzzy
+#~ msgid "F_older"
+#~ msgstr "_Pastas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#~ msgid "Forget _Passwords"
+#~ msgstr "Esquecer _Senhas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_OpГУes"
+#, fuzzy
+#~ msgid "Get Mail"
+#~ msgstr "_Correio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Imprimir a mensagem seleccionada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Read messages"
+#~ msgstr "Novas mensagens de correio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Imprimir a mensagem seleccionada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "DruМda dos _filtros"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#, fuzzy
+#~ msgid "Move"
+#~ msgstr "Sg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "Move message to a new folder"
+#~ msgstr "Gravar a mensagem na pasta especificada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "Prever impressЦo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "Encontrar mensagens"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Pessoas _NecessЦrias"
+#, fuzzy
+#~ msgid "Reply to _All"
+#~ msgstr "Reponder para todos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#, fuzzy
+#~ msgid "Reply to _Sender"
+#~ msgstr "Reponder para todos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de Мn_icio de encontro"
+#, fuzzy
+#~ msgid "Select _All"
+#~ msgstr "Reponder para todos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fim de _encontro"
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Novas mensagens de correio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#, fuzzy
+#~ msgid "_Copy to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#, fuzzy
+#~ msgid "_Edit Message"
+#~ msgstr "Mensagem de _correio"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "_Mail Configuration..."
+#~ msgstr "ConfiguraГЦo do co_rreio..."
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "Mensagem de _correio"
 
-#: widgets/misc/e-dateedit.c:407
 #, fuzzy
-msgid "Now"
-msgstr "Novo"
+#~ msgid "_Move to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#, fuzzy
+#~ msgid "_Open in New Window"
+#~ msgstr "еbrir em nova janela"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "Encontrar mensagens"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Fontes"
+
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "Apagar"
+
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "_Pastas"
+
+#~ msgid "Attach"
+#~ msgstr "Anexar"
+
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "Fechar o calendАrio corrente"
+
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Enviar a mensagem"
+
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Anexar um ficheiro Ю mensagem"
+
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Abrir ficheiro"
+
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Guardar CalendАrio como"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gravar na _pasta..."
+
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Gravar na _pasta..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Gravar a mensagem na pasta especificada"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#, fuzzy
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Enviar mensagem em formato HTML"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Enviar a mensagem"
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensagem"
+
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Enviar esta mensagem"
+
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Ver/esconder anexos"
+
+#, fuzzy
+#~ msgid "Show _attachments"
+#~ msgstr "Ver _anexos"
+
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Enviar esta mensagem"
+
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "_Abrir"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Mostrar uma pasta diferente"
+
+#, fuzzy
+#~ msgid "E_xit"
+#~ msgstr "PrС_ximo"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Atalho para _barra do Evolution"
+
+#~ msgid "Getting _Started"
+#~ msgstr "_ComeГando"
+
+#, fuzzy
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostrar a barra de pastas"
+
+#, fuzzy
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Mostrar a barra de pastas"
+
+#, fuzzy
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Mostrar a barra de atalhos"
+
+#, fuzzy
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Usando o programa de C_orreio"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Usando o _CalendАrio"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Usando o programa de C_orreio"
+
+#, fuzzy
+#~ msgid "_About Evolution..."
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Compromisso"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto"
+
+#~ msgid "_Folder"
+#~ msgstr "_Pasta"
+
+#, fuzzy
+#~ msgid "_Go to Folder..."
+#~ msgstr "Ir para a _pasta..."
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "мnd_ice de ajuda"
+
+#, fuzzy
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "Mensagem de _correio"
 
 #~ msgid "Headings:"
 #~ msgstr "CabeГalhos:"
@@ -7306,10 +6223,6 @@ msgstr "Grupo %i"
 #~ msgid "_Mail Configuration"
 #~ msgstr "ConfiguraГЦo do correio"
 
-#, fuzzy
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Compromisso"
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Inserir ficheiro como anexo"
 
@@ -7378,15 +6291,9 @@ msgstr "Grupo %i"
 #~ msgid "Check for new mail"
 #~ msgstr "Verificar novo correio"
 
-#~ 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"
 
@@ -7399,9 +6306,6 @@ msgstr "Grupo %i"
 #~ 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"
 
diff --git a/po/ru.po b/po/ru.po
index aed5296e2a..bd746b3d03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-01-17 19:09+0300\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-17 19:46+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -13,33 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-executive-summary.xml.h:6
-msgid "Add Service"
-msgstr "Добавить сервис"
-
-#: po/tmp/evolution-executive-summary.xml.h:7
-msgid "Add a new service to the Executive Summary"
-msgstr "Добавить новый сервис к Executive Summary"
-
-#: po/tmp/evolution-executive-summary.xml.h:8
-msgid "Create a new email"
-msgstr "Создать новое сообщение"
-
-#: po/tmp/evolution-executive-summary.xml.h:9
-msgid "Executive Summary Settings..."
-msgstr "Установки Executive Summary"
-
-#: po/tmp/evolution-executive-summary.xml.h:10
-msgid "New Mail"
-msgstr "Новое сообщение"
-
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Невозможно инициализировать компонент Executive Summary программы Evolution."
+msgstr ""
+"Невозможно инициализировать компонент Executive Summary программы Evolution."
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
@@ -48,8 +25,8 @@ msgstr "Невозможно инициализировать компонент Executive Summary программы Evolut
 #: addressbook/conduit/address-conduit.c:1090
 #: addressbook/gui/component/addressbook-factory.c:38
 #: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1149
-#: calendar/conduits/todo/todo-conduit.c:964 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -73,7 +50,9 @@ msgstr "Почтовые файлы в формате UNIX mbox"
 msgid ""
 "For reading mail delivered by the local system, and for storing mail on "
 "local disk."
-msgstr "Для чтения почты доставляемой локальной системой и для сохранения почты на локальном диске."
+msgstr ""
+"Для чтения почты доставляемой локальной системой и для сохранения почты на "
+"локальном диске."
 
 #: camel/providers/vee/camel-vee-folder.c:604
 #, c-format
@@ -180,16 +159,15 @@ msgstr ""
 msgid "Error"
 msgstr "Ошибка"
 
-#: mail/mail-config.c:750
+#: mail/mail-config.c:799
 msgid "Connecting to server"
 msgstr "Подключение к серверу"
 
-#: mail/mail-config.c:752
+#: mail/mail-config.c:801
 msgid "Connect to server"
 msgstr "Подключиться к серверу"
 
-#: notes/component-factory.c:27 po/tmp/evolution-addressbook.xml.h:12
-#: po/tmp/evolution-calendar.xml.h:19 po/tmp/evolution-tasks.xml.h:8
+#: notes/component-factory.c:27
 msgid "New"
 msgstr "Новый"
 
@@ -205,685 +183,6 @@ msgstr "Невозможно инициализировать компонент заметок Evolution."
 msgid "Notes Component: Could not initialize bonobo"
 msgstr "Компонент заметок: Не удалось инициализировать Bonobo"
 
-#.
-#. * 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
-#: po/tmp/evolution-task-editor-dialog.xml.h:6
-msgid "About this application"
-msgstr "Об этой программе"
-
-#: po/tmp/evolution-event-editor.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:7
-msgid "About..."
-msgstr "О программе..."
-
-#: po/tmp/evolution-event-editor.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:8
-msgid "Actio_ns"
-msgstr "Действия"
-
-#: po/tmp/evolution-event-editor.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:9
-msgid "C_lear"
-msgstr "Очистить"
-
-#: po/tmp/evolution-event-editor.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:10
-msgid "C_ut"
-msgstr "Вырезать"
-
-#: po/tmp/evolution-event-editor.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:11
-msgid "Clear"
-msgstr "Очистить"
-
-#: po/tmp/evolution-event-editor.xml.h:12
-#: po/tmp/evolution-task-editor-dialog.xml.h:12
-msgid "Clear the selection"
-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
-#: po/tmp/evolution-task-editor-dialog.xml.h:13
-msgid "Close"
-msgstr "Закрыть"
-
-#: po/tmp/evolution-message-composer.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:14
-msgid "Close the current file"
-msgstr "Закрыть текущий файл"
-
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:15
-msgid "Copy"
-msgstr "Скопировать"
-
-#: po/tmp/evolution-event-editor.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:16
-msgid "Copy the selection"
-msgstr "Скопировать выделение"
-
-#: po/tmp/evolution-event-editor.xml.h:17
-#: po/tmp/evolution-task-editor-dialog.xml.h:17
-msgid "Cut"
-msgstr "Вырезать"
-
-#: po/tmp/evolution-event-editor.xml.h:18
-#: po/tmp/evolution-task-editor-dialog.xml.h:18
-msgid "Cut the selection"
-msgstr "Вырезать выделение"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:19
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:24
-msgid "Delete"
-msgstr "Удалить"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:20
-msgid "Delete this task"
-msgstr "Удалить это задание"
-
-#: po/tmp/evolution-event-editor.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:21
-msgid "Dump XML"
-msgstr "Дамп XML"
-
-#: po/tmp/evolution-event-editor.xml.h:22
-#: po/tmp/evolution-task-editor-dialog.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Дамп XML описания интерфейса"
-
-#: po/tmp/evolution-event-editor.xml.h:23
-#: po/tmp/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Адресная книга..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Связать задание"
-
-#: po/tmp/evolution-event-editor.xml.h:24
-#: po/tmp/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Выбрать форму..."
-
-#: po/tmp/evolution-event-editor.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Проверка имен"
-
-#: po/tmp/evolution-event-editor.xml.h:26
-#: po/tmp/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Скопировать в папку..."
-
-#: po/tmp/evolution-event-editor.xml.h:27
-#: po/tmp/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: D_esign a Form..."
-msgstr ""
-
-#: po/tmp/evolution-event-editor.xml.h:28
-#: po/tmp/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Определить стиль печати"
-
-#: po/tmp/evolution-event-editor.xml.h:29
-#: po/tmp/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Конструкция этой формы"
-
-#: po/tmp/evolution-event-editor.xml.h:30
-#: po/tmp/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Первый элемент в папке"
-
-#: po/tmp/evolution-event-editor.xml.h:31
-#: po/tmp/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: For_ward"
-msgstr "FIXME: Переслать"
-
-#: po/tmp/evolution-event-editor.xml.h:33
-#: po/tmp/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Справка"
-
-#: po/tmp/evolution-event-editor.xml.h:34
-#: po/tmp/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Невыполненное задание"
-
-#: po/tmp/evolution-event-editor.xml.h:35
-#: po/tmp/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Вставить файл"
-
-#: po/tmp/evolution-event-editor.xml.h:36
-#: po/tmp/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: Элемент..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Запрос встречи"
-
-#: po/tmp/evolution-event-editor.xml.h:37
-#: po/tmp/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Специальная вставка..."
-
-#: po/tmp/evolution-event-editor.xml.h:38
-#: po/tmp/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Просмотр печати"
-
-#: po/tmp/evolution-event-editor.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
-
-#: po/tmp/evolution-event-editor.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: Publish _Form..."
-msgstr ""
-
-#: po/tmp/evolution-event-editor.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Повторение..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Ответить всем"
-
-#: po/tmp/evolution-event-editor.xml.h:42
-#: po/tmp/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: S_end"
-msgstr "FIXME: Послать"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: Послать отчет о состоянии"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Пропустить повторы"
-
-#: po/tmp/evolution-event-editor.xml.h:43
-#: po/tmp/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Сохранить вложение..."
-
-#: po/tmp/evolution-event-editor.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Отладчик скрипта"
-
-#: po/tmp/evolution-event-editor.xml.h:45
-#: po/tmp/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Запрос задачи"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Appointment"
-msgstr "FIXME: Встреча"
-
-#: po/tmp/evolution-event-editor.xml.h:46
-#: po/tmp/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Contact"
-msgstr "FIXME: Контакт"
-
-#: po/tmp/evolution-event-editor.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Настройка..."
-
-#: po/tmp/evolution-event-editor.xml.h:48
-#: po/tmp/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _File..."
-msgstr "FIXME: файл..."
-
-#: po/tmp/evolution-event-editor.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Font..."
-msgstr "FIXME: Шрифт..."
-
-#: po/tmp/evolution-event-editor.xml.h:50
-#: po/tmp/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Formatting"
-msgstr "FIXME: Форматирование"
-
-#: po/tmp/evolution-event-editor.xml.h:51
-#: po/tmp/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Item"
-msgstr "FIXME: Элемент"
-
-#: po/tmp/evolution-event-editor.xml.h:52
-#: po/tmp/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Журнальная запись"
-
-#: po/tmp/evolution-event-editor.xml.h:53
-#: po/tmp/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: Последний элемент в папке"
-
-#: po/tmp/evolution-event-editor.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Правка сообщения"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: Пометить как выполненное"
-
-#: po/tmp/evolution-event-editor.xml.h:55
-#: po/tmp/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Стиль памятки"
-
-#: po/tmp/evolution-event-editor.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Переместить в папку..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _New Task"
-msgstr "FIXME: Новая задача"
-
-#: po/tmp/evolution-event-editor.xml.h:59
-#: po/tmp/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Object..."
-msgstr "FIXME: Объект..."
-
-#: po/tmp/evolution-event-editor.xml.h:60
-#: po/tmp/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: Абзац..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _Reply"
-msgstr "FIXME: Ответить"
-
-#: po/tmp/evolution-event-editor.xml.h:61
-#: po/tmp/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: Правописание..."
-
-#: po/tmp/evolution-event-editor.xml.h:62
-#: po/tmp/evolution-task-editor-dialog.xml.h:68
-msgid "FIXME: _Standard"
-msgstr "FIXME: Стандартная"
-
-#: po/tmp/evolution-event-editor.xml.h:63
-#: po/tmp/evolution-task-editor-dialog.xml.h:69
-msgid "FIXME: _Task"
-msgstr "FIXME: Задача"
-
-#: po/tmp/evolution-event-editor.xml.h:64
-#: po/tmp/evolution-task-editor-dialog.xml.h:70
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Непрочитанный элемент"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:71
-msgid "FIXME: _note"
-msgstr "FIXME: запись"
-
-#: po/tmp/evolution-event-editor.xml.h:65
-#: po/tmp/evolution-task-editor-dialog.xml.h:72
-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-task-editor-dialog.xml.h:73
-msgid "F_ormat"
-msgstr "Формат"
-
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-#: po/tmp/evolution-task-editor-dialog.xml.h:74
-msgid "Find"
-msgstr "Поиск"
-
-#: po/tmp/evolution-event-editor.xml.h:68
-#: po/tmp/evolution-task-editor-dialog.xml.h:75
-msgid "Find Again"
-msgstr "Повторный поиск"
-
-#: po/tmp/evolution-event-editor.xml.h:69
-#: po/tmp/evolution-task-editor-dialog.xml.h:76
-msgid "Find _Again"
-msgstr "Повторный поиск"
-
-#: po/tmp/evolution-event-editor.xml.h:70
-#: po/tmp/evolution-task-editor-dialog.xml.h:77
-msgid "Go to the next item"
-msgstr "Перейти к следующему элементу"
-
-#: po/tmp/evolution-event-editor.xml.h:71
-#: po/tmp/evolution-task-editor-dialog.xml.h:78
-msgid "Go to the previous item"
-msgstr "Перейти к предыдущему элементу"
-
-#: po/tmp/evolution-event-editor.xml.h:72
-#: po/tmp/evolution-task-editor-dialog.xml.h:79
-msgid "Modify the file's properties"
-msgstr "Изменить свойства файла"
-
-#: po/tmp/evolution-event-editor.xml.h:73
-#: po/tmp/evolution-task-editor-dialog.xml.h:80
-msgid "N_ext"
-msgstr "След."
-
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-#: po/tmp/evolution-task-editor-dialog.xml.h:81
-msgid "Next"
-msgstr "След."
-
-#: po/tmp/evolution-event-editor.xml.h:75
-#: po/tmp/evolution-task-editor-dialog.xml.h:82
-msgid "Paste"
-msgstr "Вставить"
-
-#: po/tmp/evolution-event-editor.xml.h:76
-#: po/tmp/evolution-task-editor-dialog.xml.h:83
-msgid "Paste the clipboard"
-msgstr "Вставить выделение"
-
-#: po/tmp/evolution-event-editor.xml.h:77
-#: po/tmp/evolution-task-editor-dialog.xml.h:84
-msgid "Pre_vious"
-msgstr "Пред."
-
-#: po/tmp/evolution-event-editor.xml.h:78
-#: po/tmp/evolution-task-editor-dialog.xml.h:85
-msgid "Previous"
-msgstr "Пред."
-
-#: po/tmp/evolution-event-editor.xml.h:79
-#: po/tmp/evolution-task-editor-dialog.xml.h:86
-msgid "Print S_etup..."
-msgstr "Настройка печати..."
-
-#: po/tmp/evolution-event-editor.xml.h:80
-#: po/tmp/evolution-task-editor-dialog.xml.h:87
-msgid "Print Setup"
-msgstr "Настройка страницы"
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-#: po/tmp/evolution-task-editor-dialog.xml.h:88
-msgid "Print this item"
-msgstr "Печать этого элемента"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-#: po/tmp/evolution-task-editor-dialog.xml.h:89
-msgid "Print..."
-msgstr "Печать..."
-
-#: po/tmp/evolution-event-editor.xml.h:83
-#: po/tmp/evolution-task-editor-dialog.xml.h:90
-msgid "Properties"
-msgstr "Свойства"
-
-#: po/tmp/evolution-event-editor.xml.h:84
-#: po/tmp/evolution-task-editor-dialog.xml.h:91
-msgid "Redo"
-msgstr "Возврат"
-
-#: po/tmp/evolution-event-editor.xml.h:85
-#: po/tmp/evolution-task-editor-dialog.xml.h:92
-msgid "Redo the undone action"
-msgstr "Повторить отмененное действие"
-
-#: po/tmp/evolution-event-editor.xml.h:86
-#: po/tmp/evolution-task-editor-dialog.xml.h:93
-msgid "Replace"
-msgstr "Заменить"
-
-#: po/tmp/evolution-event-editor.xml.h:87
-#: po/tmp/evolution-task-editor-dialog.xml.h:94
-msgid "Replace a string"
-msgstr "Заменить строку"
-
-#: po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:95
-msgid "Save"
-msgstr "Сохранить"
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:96
-msgid "Save _As..."
-msgstr "Сохранить как..."
-
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
-#: po/tmp/evolution-task-editor-dialog.xml.h:97
-msgid "Save and Close"
-msgstr "Сохранить и закрыть"
-
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:98
-msgid "Save the current file"
-msgstr "Сохранить текущий файл"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:99
-msgid "Save the task and close the dialog box"
-msgstr "Сохранить задание и закрыть окно диалога"
-
-#: po/tmp/evolution-event-editor.xml.h:96
-#: po/tmp/evolution-task-editor-dialog.xml.h:100
-msgid "Search again for the same string"
-msgstr "Искать ту же строку еще раз"
-
-#: po/tmp/evolution-event-editor.xml.h:97
-#: po/tmp/evolution-task-editor-dialog.xml.h:101
-msgid "Search for a string"
-msgstr "Поиск строки"
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-#: po/tmp/evolution-task-editor-dialog.xml.h:102
-msgid "See online help"
-msgstr "Просмотр онлайновой справки"
-
-#: po/tmp/evolution-event-editor.xml.h:99
-#: po/tmp/evolution-task-editor-dialog.xml.h:103
-msgid "Select All"
-msgstr "Выбрать все"
-
-#: po/tmp/evolution-event-editor.xml.h:100
-#: po/tmp/evolution-task-editor-dialog.xml.h:104
-msgid "Select everything"
-msgstr "Выбрать все"
-
-#: po/tmp/evolution-event-editor.xml.h:101
-#: po/tmp/evolution-task-editor-dialog.xml.h:105
-msgid "Setup the page settings for your current printer"
-msgstr "Настройки страницы для вашего текущего принтера"
-
-#: po/tmp/evolution-event-editor.xml.h:102
-#: po/tmp/evolution-task-editor-dialog.xml.h:106
-msgid "Undo"
-msgstr "Откат"
-
-#: po/tmp/evolution-event-editor.xml.h:103
-#: po/tmp/evolution-task-editor-dialog.xml.h:107
-msgid "Undo the last action"
-msgstr "Отменить последнее действие"
-
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:108
-msgid "_About..."
-msgstr "О программе..."
-
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:109
-msgid "_Close"
-msgstr "Закрыть"
-
-#: po/tmp/evolution-event-editor.xml.h:106
-#: po/tmp/evolution-task-editor-dialog.xml.h:110
-msgid "_Copy"
-msgstr "Скопировать"
-
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:111
-msgid "_Debug"
-msgstr "Отладка"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:112
-msgid "_Delete"
-msgstr "Удалить"
-
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15
-#: po/tmp/evolution-task-editor-dialog.xml.h:113 po/tmp/evolution.xml.h:32
-msgid "_Edit"
-msgstr "Правка"
-
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:114 po/tmp/evolution.xml.h:33
-msgid "_File"
-msgstr "Файл"
-
-#: po/tmp/evolution-event-editor.xml.h:111
-#: po/tmp/evolution-task-editor-dialog.xml.h:115
-msgid "_Find..."
-msgstr "Найти..."
-
-#: po/tmp/evolution-event-editor.xml.h:112
-#: po/tmp/evolution-task-editor-dialog.xml.h:116
-msgid "_Forms"
-msgstr "Формы"
-
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:117 po/tmp/evolution.xml.h:36
-msgid "_Help"
-msgstr "Справка"
-
-#: po/tmp/evolution-event-editor.xml.h:114
-#: po/tmp/evolution-task-editor-dialog.xml.h:118
-msgid "_Insert"
-msgstr "Вставить"
-
-#: po/tmp/evolution-event-editor.xml.h:115
-#: po/tmp/evolution-task-editor-dialog.xml.h:119
-msgid "_Object"
-msgstr "Объект"
-
-#: po/tmp/evolution-event-editor.xml.h:116
-#: po/tmp/evolution-task-editor-dialog.xml.h:120
-msgid "_Paste"
-msgstr "Вставить"
-
-#: po/tmp/evolution-event-editor.xml.h:117
-#: po/tmp/evolution-task-editor-dialog.xml.h:121
-#: po/tmp/evolution-tasks.xml.h:12
-msgid "_Print"
-msgstr "Печать"
-
-#: po/tmp/evolution-event-editor.xml.h:118
-#: po/tmp/evolution-task-editor-dialog.xml.h:122
-msgid "_Properties..."
-msgstr "Свойства..."
-
-#: po/tmp/evolution-event-editor.xml.h:119
-#: po/tmp/evolution-task-editor-dialog.xml.h:123
-msgid "_Redo"
-msgstr "Возврат"
-
-#: po/tmp/evolution-event-editor.xml.h:120
-#: po/tmp/evolution-task-editor-dialog.xml.h:124
-msgid "_Replace..."
-msgstr "Заменить..."
-
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:125
-msgid "_Save"
-msgstr "Сохранить"
-
-#: po/tmp/evolution-event-editor.xml.h:122
-#: po/tmp/evolution-task-editor-dialog.xml.h:126
-msgid "_Toolbars"
-msgstr "Панель инструментов"
-
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-#: po/tmp/evolution-task-editor-dialog.xml.h:127
-msgid "_Tools"
-msgstr "Инструменты"
-
-#: po/tmp/evolution-event-editor.xml.h:124
-#: po/tmp/evolution-task-editor-dialog.xml.h:128
-msgid "_Undo"
-msgstr "Откат"
-
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:129 po/tmp/evolution.xml.h:43
-#: shell/e-storage-set-view.c:335
-msgid "_View"
-msgstr "Просмотр"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
-msgid "Alter preferences"
-msgstr "Другие настройки"
-
-#: po/tmp/evolution-tasks.xml.h:7
-msgid "Create a new task"
-msgstr "Создать новое задание"
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:31 po/tmp/evolution-tasks.xml.h:9
-msgid "Print"
-msgstr "Печать"
-
-#: po/tmp/evolution-tasks.xml.h:10
-msgid "Save task as something else"
-msgstr "Сохранить задание как что-нибудь еще"
-
-#: po/tmp/evolution-tasks.xml.h:11
-msgid "Tasks Preferences..."
-msgstr "Настройки заданий..."
-
-#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-tasks.xml.h:13
-msgid "_Save As..."
-msgstr "Сохранить как..."
-
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Карточка: "
@@ -1280,14 +579,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
 #: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:728
-#: calendar/conduits/todo/todo-conduit.c:543
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
@@ -1297,14 +596,6 @@ msgid "Could not read pilot's Address application block"
 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.
@@ -1313,6 +604,11 @@ msgstr "Удалить контакт?"
 msgid "_Add"
 msgstr "Добавить"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: ui/evolution-contact-editor.xml:37
+msgid "_Delete"
+msgstr "Удалить"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Тип телефона"
@@ -1322,13 +618,7 @@ 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
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Добавить"
 
@@ -1386,7 +676,6 @@ msgid "C_ontacts..."
 msgstr "Контакты..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Категории..."
 
@@ -1403,7 +692,6 @@ msgid "_Address..."
 msgstr "Адрес..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "Общее"
 
@@ -1448,7 +736,6 @@ msgid "No_tes:"
 msgstr "Заметки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Детали"
 
@@ -1555,54 +842,6 @@ msgid "Email 3"
 msgstr "Эл.адрес 3"
 
 #.
-#. * 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:"
-
-#: 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.
@@ -1669,12 +908,7 @@ msgstr "Суффикс:"
 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:237
-#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Как таблица"
 
@@ -1791,7 +1025,6 @@ msgid "Remember this password"
 msgstr "Запомнить этот пароль"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
 msgid "Host:"
 msgstr "Хост:"
 
@@ -1808,12 +1041,10 @@ msgid "Search Scope:"
 msgstr "Поиск области действия:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Идентификация:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Путь:"
 
@@ -1837,175 +1068,27 @@ msgstr ""
 "Выберите вид вашей адресной книги и введите соответствующую информацию о ней."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Имя:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Описание:"
 
-#: po/tmp/addressbook-config.glade.h:7
-msgid "Addressbook Sources"
-msgstr "Источники адресных книг"
-
-#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
-msgid "Edit"
-msgstr "Правка"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#: po/tmp/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Имя"
-
-#: po/tmp/addressbook-config.glade.h:11
-msgid "URI"
-msgstr "URI"
-
-#.
-#. * 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:"
-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 "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"
-
-#: 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:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Имя"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:566
 msgid "Email"
 msgstr "Эл.адрес"
@@ -2072,178 +1155,6 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь для создания нового контакта."
 
-#.
-#. * 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 "Пустая форма в конце:"
-
-#: 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
-msgid "Format"
-msgstr "Формат"
-
-#: 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
-msgid "Portrait"
-msgstr "Портрет"
-
-#: 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
-msgid "Size:"
-msgstr "Размер:"
-
-#: 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
-msgid "Top:"
-msgstr "Сверху:"
-
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
-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 "метка26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Кондуит календаря Evolution"
@@ -2252,13 +1163,13 @@ msgstr "Кондуит календаря Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Средство настройки для кондуита календаря Evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:684
-#: calendar/conduits/todo/todo-conduit.c:499
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/conduits/calendar/calendar-conduit.c:783
-#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Невозможно прочесть блок приложения календарь Пилота"
 
@@ -2270,8 +1181,8 @@ msgstr "Кондуит заданий Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Средство настройки для кондуита заданий Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:598
-#: calendar/conduits/todo/todo-conduit.c:601
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
@@ -2280,7 +1191,7 @@ msgstr "Невозможно прочесть блок приложения заданий Пилота"
 msgid "Reminder of your appointment at "
 msgstr "Напоминать о ваших встречах"
 
-#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Короткий сон"
 
@@ -2328,15 +1239,15 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:374 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/calendar-model.c:377 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/calendar-model.c:380 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
@@ -2474,251 +1385,6 @@ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Итог не доступен."
 
-#: po/tmp/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Правка встречи"
-
-#: 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 "05 минут"
-
-#: po/tmp/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 минут"
-
-#: po/tmp/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12-часовой (ДП/ПП)"
-
-#: po/tmp/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 минут"
-
-#: po/tmp/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24-часовой"
-
-#: po/tmp/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 минут"
-
-#: po/tmp/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 минут"
-
-#: 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 "Отобразить параметры"
-
-#: calendar/gui/e-calendar-table.c:159 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:439 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:435 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 "Выбрать цвет"
-
-#: calendar/gui/e-calendar-table.c:162 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/event-editor.c:440 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:441 po/tmp/cal-prefs-dialog.glade.h:49
-msgid "Sunday"
-msgstr "Воскресенье"
-
-#: 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 "Чтв"
-
-#: calendar/gui/event-editor.c:438 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:436 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:437 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 "секунд."
-
 #: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2746,99 +1412,6 @@ msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
 msgid "Are you sure want to delete this untitled journal entry?"
 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 "Низкий"
-
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:651 mail/mail-account-editor.c:653
-#: mail/mail-config-druid.c:841 po/tmp/mail-config.glade.h:46
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Нет"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-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
-msgid "Task"
-msgstr "Задание"
-
-#: po/tmp/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: po/tmp/task-editor-dialog.glade.h:26
-msgid "Undefined"
-msgstr "Неопределенное"
-
-#: po/tmp/task-editor-dialog.glade.h:27
-msgid "_Contacts..."
-msgstr "Контакты..."
-
-#: po/tmp/task-editor-dialog.glade.h:28
-msgid "_Due Date:"
-msgstr "Условленная дата:"
-
-#: po/tmp/task-editor-dialog.glade.h:29
-msgid "_Priority:"
-msgstr "Приоритет:"
-
-#: po/tmp/task-editor-dialog.glade.h:30
-msgid "_Status:"
-msgstr "Состояние:"
-
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "диалог редактора заданий"
-
 #: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Правка задания"
@@ -2870,7 +1443,7 @@ msgstr "Хотите сохранить изменения?"
 msgid "Categories"
 msgstr "Категории"
 
-#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:155
 msgid "Classification"
 msgstr "Классификация"
 
@@ -2886,6 +1459,10 @@ msgstr "Дата окончания"
 msgid "Start Date"
 msgstr "Дата начала"
 
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Условленная дата"
+
 #: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr "Географическое расположение"
@@ -2894,6 +1471,10 @@ msgstr "Географическое расположение"
 msgid "Precent complete"
 msgstr "Процент выполненного"
 
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Приоритет"
+
 #: calendar/gui/e-calendar-table.c:163
 msgid "Summary"
 msgstr "Итог"
@@ -2926,6 +1507,11 @@ msgstr "Пометить как выполненное"
 msgid "Mark the task complete"
 msgstr "Пометить задание как выполненное"
 
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Удалить"
+
 #: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Удалить задание"
@@ -2937,62 +1523,61 @@ 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:1213
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1227
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1240
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:289
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "д.п."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:292
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "п.п."
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
-#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3172
-#: calendar/gui/e-week-view.c:3179 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3177
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3184
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3186
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
@@ -3018,170 +1603,10 @@ msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "Все события дня"
-
-#: po/tmp/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Основания встречи"
-
-#: po/tmp/event-editor-dialog.glade.h:11
-msgid "Custom recurrence"
-msgstr "Другое повторение"
-
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Дни"
-
-#: po/tmp/event-editor-dialog.glade.h:14
-msgid "Every"
-msgstr "Каждый"
-
-#: po/tmp/event-editor-dialog.glade.h:15
-msgid "Exceptions"
-msgstr "Исключения"
-
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Часы"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Почта для:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Минуты"
-
-#: po/tmp/event-editor-dialog.glade.h:20
-msgid "Modify"
-msgstr "Изменить"
-
-#: po/tmp/event-editor-dialog.glade.h:21
-msgid "No recurrence"
-msgstr "Без повторения"
-
-#: po/tmp/event-editor-dialog.glade.h:22
-msgid "Preview"
-msgstr "Просмотр"
-
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Личное"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "Общее"
-
-#: po/tmp/event-editor-dialog.glade.h:25
-msgid "Recurrence"
-msgstr "Повторение"
-
-#: po/tmp/event-editor-dialog.glade.h:26
-msgid "Recurrence Rule"
-msgstr "Правило повторения"
-
-#: po/tmp/event-editor-dialog.glade.h:27
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Простое повторение"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "Итог:"
-
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Время"
-
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "Аудио"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "Конфиденциальное"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "Контакты"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "Отобразить"
-
-#: po/tmp/event-editor-dialog.glade.h:35
-msgid "_End time:"
-msgstr "Время окончания:"
-
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "Почта"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "Программа"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "Запустить программу:"
-
-#: po/tmp/event-editor-dialog.glade.h:39
-msgid "_Start time:"
-msgstr "Время начала:"
-
-#: po/tmp/event-editor-dialog.glade.h:40
-msgid "_Starting date:"
-msgstr "Дата начала:"
-
-#: po/tmp/event-editor-dialog.glade.h:41
-msgid "day(s)"
-msgstr "день"
-
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "диалог редактора событий"
-
-#: po/tmp/event-editor-dialog.glade.h:43
-msgid "for"
-msgstr "в"
-
-#: po/tmp/event-editor-dialog.glade.h:44
-msgid "forever"
-msgstr "всегда"
-
-#: po/tmp/event-editor-dialog.glade.h:45
-msgid "label21"
-msgstr "метка26"
-
-#: po/tmp/event-editor-dialog.glade.h:46
-msgid "month(s)"
-msgstr "месяц"
-
-#: po/tmp/event-editor-dialog.glade.h:47
-msgid "until"
-msgstr "до"
-
-#: po/tmp/event-editor-dialog.glade.h:48
-msgid "week(s)"
-msgstr "неделя"
-
-#: po/tmp/event-editor-dialog.glade.h:49
-msgid "year(s)"
-msgstr "год"
-
 #: calendar/gui/event-editor.c:331
 msgid "Edit Appointment"
 msgstr "Правка встречи"
@@ -3194,6 +1619,34 @@ msgstr "в"
 msgid "day"
 msgstr "день"
 
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Понедельник"
+
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Среда"
+
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Четверг"
+
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "Пятница"
+
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Суббота"
+
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Воскресенье"
+
 #: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr ""
@@ -3227,65 +1680,34 @@ msgstr "Невозможно открыть папку \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
-msgid "April"
-msgstr "Апрель"
-
-#: po/tmp/goto-dialog.glade.h:7
-msgid "August"
-msgstr "Август"
-
-#: po/tmp/goto-dialog.glade.h:8
-msgid "December"
-msgstr "Декабрь"
-
-#: po/tmp/goto-dialog.glade.h:9
-msgid "February"
-msgstr "Февраль"
-
-#: po/tmp/goto-dialog.glade.h:10
-msgid "Go To Date"
-msgstr "Перейти к дате"
-
-#: po/tmp/goto-dialog.glade.h:11
-msgid "Go To Today"
-msgstr "Сегодня"
-
-#: po/tmp/goto-dialog.glade.h:12
-msgid "January"
-msgstr "Январь"
-
-#: po/tmp/goto-dialog.glade.h:13
-msgid "July"
-msgstr "Июль"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Вск"
 
-#: po/tmp/goto-dialog.glade.h:14
-msgid "June"
-msgstr "Июнь"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Пон"
 
-#: po/tmp/goto-dialog.glade.h:15
-msgid "March"
-msgstr "Март"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Втр"
 
-#: po/tmp/goto-dialog.glade.h:16
-msgid "May"
-msgstr "Май"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Срд"
 
-#: po/tmp/goto-dialog.glade.h:17
-msgid "November"
-msgstr "Ноябрь"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Чтв"
 
-#: po/tmp/goto-dialog.glade.h:18
-msgid "October"
-msgstr "Октябрь"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Пят"
 
-#: po/tmp/goto-dialog.glade.h:19
-msgid "September"
-msgstr "Сентябрь"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Суб"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -4097,7 +2519,8 @@ msgstr "Новости USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:40
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
 
 #: camel/providers/nntp/camel-nntp-store.c:226
 #, c-format
@@ -4113,7 +2536,9 @@ msgstr "Новости USENET через %s"
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "Подключение к NNTP серверу будет производиться с использованием незашифрованного пароля."
+msgstr ""
+"Подключение к NNTP серверу будет производиться с использованием "
+"незашифрованного пароля."
 
 #: camel/providers/nntp/camel-nntp-store.c:327
 #: camel/providers/nntp/camel-nntp-store.c:490
@@ -4226,7 +2651,6 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4300,7 +2724,6 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:295
-#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -4442,12 +2865,11 @@ msgid "attachment"
 msgstr "вложение"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Удалить"
 
@@ -4463,22 +2885,6 @@ msgstr "Добавить вложение..."
 msgid "Attach a file to the message"
 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:6
-msgid "Attachment properties"
-msgstr "Свойства вложения"
-
-#: 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 "Тип MIME:"
-
 #: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
 #: mail/mail-format.c:624
 msgid "From:"
@@ -4618,7 +3024,7 @@ msgstr "Создать сообщение"
 msgid "Could not create composer window."
 msgstr "Невозможно создать окно редактора."
 
-#: composer/evolution-composer.c:345
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
@@ -4754,7 +3160,7 @@ msgstr "входящие"
 msgid "outgoing"
 msgstr "исходящие"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Правка фильтров"
 
@@ -4855,30 +3261,6 @@ msgstr "Важное"
 msgid "Read"
 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"
@@ -5126,29 +3508,35 @@ msgstr "Фильтр по получателю"
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "Открыть"
 
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Правка"
+
 #: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Сохранить как..."
 
+#: mail/folder-browser.c:661 mail/mail-view.c:148
+msgid "Print"
+msgstr "Печать"
+
 #: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Ответить отправителю"
 
 #: mail/folder-browser.c:664 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Ответить всем"
 
 #: mail/folder-browser.c:665 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Переслать встроенное"
 
@@ -5187,45 +3575,33 @@ msgstr "Создать правило из сообщения"
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
-msgid "Current store format:"
-msgstr "Текущий формат хранения:"
-
-#: po/tmp/local-config.glade.h:7
-msgid "Mailbox Format"
-msgstr "Формат почтового ящика"
-
-#: po/tmp/local-config.glade.h:8
-msgid "New store format:"
-msgstr "Новый формат хранения:"
-
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr "Внимание: при преобразовании между форматами почтовых ящиков, ошибка\n"
-
-#: po/tmp/local-config.glade.h:12
-msgid "maildir"
-msgstr "maildir"
-
-#: po/tmp/local-config.glade.h:13
-msgid "mbox"
-msgstr "mbox"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Нет"
 
-#: po/tmp/local-config.glade.h:14
-msgid "mh"
-msgstr "mh"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Исх.значения"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:341
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Диспетчер счетов Evolution"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:608
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Редактор счетов Evolution"
 
@@ -5358,227 +3734,7 @@ msgstr "Печать сообщения"
 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.glade.h:6
-msgid "Account"
-msgstr "Счет"
-
-#: po/tmp/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Информация о счете"
-
-#: po/tmp/mail-config.glade.h:8
-msgid "Account Management"
-msgstr "Управление счетами"
-
-#: po/tmp/mail-config.glade.h:9
-msgid "Account Properties"
-msgstr "Свойства счета"
-
-#: po/tmp/mail-config.glade.h:11
-msgid "Advanced"
-msgstr "Расширенные"
-
-#: po/tmp/mail-config.glade.h:12
-msgid "Authentication"
-msgstr "Идентификация"
-
-#: po/tmp/mail-config.glade.h:13
-msgid "Authentication Type:"
-msgstr "Тип идентификации"
-
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Поздравляем, настройка почты завершена.\n"
-
-#: po/tmp/mail-config.glade.h:22
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: po/tmp/mail-config.glade.h:23
-msgid "Default"
-msgstr "Исх.значения"
-
-#: po/tmp/mail-config.glade.h:25
-msgid "Done"
-msgstr "Сделано"
-
-#: po/tmp/mail-config.glade.h:26
-msgid "E-Mail Address:"
-msgstr "Эл.адрес:"
-
-#: po/tmp/mail-config.glade.h:28
-msgid "Email Address:"
-msgstr "Эл.адрес:"
-
-#: po/tmp/mail-config.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "Настройка почты Evolution"
-
-#: po/tmp/mail-config.glade.h:30
-msgid "Full Name:"
-msgstr "Полное имя:"
-
-#: po/tmp/mail-config.glade.h:33
-msgid "Hostname:"
-msgstr "Имя хоста:"
-
-#: po/tmp/mail-config.glade.h:34
-msgid "Identity"
-msgstr "Именование"
-
-#: po/tmp/mail-config.glade.h:35
-msgid "Incoming Mail Server"
-msgstr "Входящий почтовый сервер"
-
-#: po/tmp/mail-config.glade.h:36
-msgid "Keep mail on server"
-msgstr "Сохранять почту на сервере"
-
-#: po/tmp/mail-config.glade.h:37
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: po/tmp/mail-config.glade.h:38
-msgid "Mail"
-msgstr "Почта"
-
-#: po/tmp/mail-config.glade.h:39
-msgid "Mail Account"
-msgstr "Почтовый счет"
-
-#: po/tmp/mail-config.glade.h:40
-msgid "Mail Configuration"
-msgstr "Настройка почты"
-
-#: po/tmp/mail-config.glade.h:41
-msgid "Mail Configuration Druid"
-msgstr "Помощник по настройке почты"
-
-#: po/tmp/mail-config.glade.h:42
-msgid "Make this my default account"
-msgstr "Сделать моим счетом по умолчанию"
-
-#: po/tmp/mail-config.glade.h:43
-msgid "Miscellaneous"
-msgstr "Разное"
-
-#: po/tmp/mail-config.glade.h:45
-msgid "News"
-msgstr "Новые"
-
-#: po/tmp/mail-config.glade.h:47
-msgid "Optional"
-msgstr "Дополнительные"
-
-#: po/tmp/mail-config.glade.h:48
-msgid "Organization:"
-msgstr "Организация:"
-
-#: po/tmp/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Исходящий почтовый сервер"
-
-#: po/tmp/mail-config.glade.h:50
-msgid "Password:"
-msgstr "Пароль:"
-
-#: po/tmp/mail-config.glade.h:52
-msgid "Plain Text"
-msgstr "Простой текст"
-
-#: po/tmp/mail-config.glade.h:53
-msgid "Receiving Email"
-msgstr "Получение эл.почты"
-
-#: po/tmp/mail-config.glade.h:54
-msgid "Remember my password"
-msgstr "Запомнить мой пароль"
-
-#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
-msgid "Reply-To:"
-msgstr "Ответить:"
-
-#: po/tmp/mail-config.glade.h:56
-msgid "Required"
-msgstr "Требуемый"
-
-#: po/tmp/mail-config.glade.h:57
-msgid "SMTP"
-msgstr "SMTP"
-
-#: po/tmp/mail-config.glade.h:58
-msgid "Save password"
-msgstr "Сохранить пароль"
-
-#: po/tmp/mail-config.glade.h:59
-msgid "Select signature file"
-msgstr "Выбрать файл подписи"
-
-#: po/tmp/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Отправка эл.почты"
-
-#: po/tmp/mail-config.glade.h:62
-msgid "Server Configuration"
-msgstr "Настройка сервера"
-
-#: po/tmp/mail-config.glade.h:63
-msgid "Server Type: "
-msgstr "Тип сервера:"
-
-#: po/tmp/mail-config.glade.h:64
-msgid "Server requires authentication"
-msgstr "Сервер требует идентификации"
-
-#: po/tmp/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Серверы"
-
-#: po/tmp/mail-config.glade.h:66
-msgid "Signature file:"
-msgstr "Файл подписи:"
-
-#: po/tmp/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Подпись:"
-
-#: po/tmp/mail-config.glade.h:68
-msgid "Sources"
-msgstr "Источники"
-
-#: po/tmp/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "Этот сервер требует защищенного подключения (SSL)"
-
-#: po/tmp/mail-config.glade.h:70
-msgid "Type"
-msgstr "Тип"
-
-#: po/tmp/mail-config.glade.h:71
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Введите название, по которому вы хотите указывать эти серверы. Например: "
-"\"Работа\" или \"Дом\"."
-
-#: po/tmp/mail-config.glade.h:73
-msgid "User Information"
-msgstr "Информация о пользователе"
-
-#: po/tmp/mail-config.glade.h:74
-msgid "Username:"
-msgstr "Имя пользователя:"
-
-#: po/tmp/mail-config.glade.h:75
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Добро пожаловать к помощнику по настройке почты в Evolution.\n"
-
-#: mail/mail-config-druid.c:360
+#: mail/mail-config-druid.c:363
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5587,7 +3743,7 @@ msgstr ""
 "Сбой при проверке настроек входящей почты.\n"
 "У вас могут возникнуть проблемы с получением вашей почты с %s"
 
-#: mail/mail-config-druid.c:626
+#: mail/mail-config-druid.c:629
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5597,7 +3753,7 @@ msgstr ""
 "У вас могут возникнуть проблемы с отправкой вашей почты через %s"
 
 #. set window title
-#: mail/mail-config-druid.c:946
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr "Помощник по счетам Evolution"
 
@@ -5655,6 +3811,10 @@ msgstr "Скрыть"
 msgid "%s attachment"
 msgstr "%s вложение"
 
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Ответить:"
+
 #: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Зашифрованное сообщение не отображается"
@@ -5778,143 +3938,143 @@ msgstr ""
 msgid "Working"
 msgstr "Обработка"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Получение почты c %s"
 
-#: mail/mail-ops.c:92
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Получить почту c %s"
 
-#: mail/mail-ops.c:342
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Нет новой почты на %s."
 
-#: mail/mail-ops.c:413
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Фильтрация почты по запросу"
 
-#: mail/mail-ops.c:415
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Фильтр почты по запросу"
 
-#: mail/mail-ops.c:546
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Отправка очереди"
 
-#: mail/mail-ops.c:666
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Отправить очередь"
 
-#: mail/mail-ops.c:801 mail/mail-ops.c:808
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Присоединение \"%s\""
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:811
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Присоединение сообщения без темы"
 
-#: mail/mail-ops.c:894
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:932
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1030
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1096 mail/subscribe-dialog.c:347
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:1161
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1202 mail/mail-ops.c:1271
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1333
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Синхронизация папки"
 
-#: mail/mail-ops.c:1383
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "Получение сообщений"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Загрузка папки %s для %s"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Загрузить папку %s для %s"
 
-#: mail/mail-ops.c:1825
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Сохранение сообщений"
 
-#: mail/mail-ops.c:1904
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5923,12 +4083,12 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
 
-#: mail/mail-ops.c:1931
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6051,27 +4211,27 @@ msgstr "Новая вирт.папка"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Ответить всем получателям этого сообщения"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Переслать это сообщение"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Распечатать выделенное сообщение"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
@@ -6375,9 +4535,14 @@ msgstr "(Папки не показаны)"
 msgid "Folders"
 msgstr "Папки"
 
-#: shell/e-shell-view.c:1097
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Эволюция - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Эволюция - %s"
 
 #: shell/e-shell.c:372
@@ -6471,7 +4636,11 @@ msgstr "Удалить эту закладку из строки закладок"
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения закладок."
 
-#: shell/e-storage-set-view.c:335
+#: shell/e-storage-set-view.c:338
+msgid "_View"
+msgstr "Просмотр"
+
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Просмотр выбранной папки"
 
@@ -6585,821 +4754,1962 @@ msgstr "Отключено."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
-#: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Создать новый контакт"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "FIXME: Встреча"
 
-#: po/tmp/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Удалить контакт"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Запрос встречи"
 
-#: po/tmp/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Поиск контакта"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Правка сообщения"
 
-#: po/tmp/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Печать контактов"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: Контакт"
 
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
-msgid "Stop"
-msgstr "Стоп"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: Задача"
 
-#: po/tmp/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Остановить загрузку"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Запрос задачи"
 
-#: po/tmp/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Просмотреть все"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Журнальная запись"
 
-#: po/tmp/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Просмотреть все контакты"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: Запись"
 
-#: po/tmp/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "Настройка адресной книги..."
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Выбрать форму..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Напечатать контакты..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Стиль памятки"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "Поиск контактов"
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Определить стиль печати"
 
-#.
-#. * 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 дней"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: Послать"
+
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Сохранить вложение..."
+
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: Переместить в папку..."
+
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Скопировать в папку..."
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Настройка страницы:"
 
-#: po/tmp/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Календарь"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Просмотр печати"
 
-#: po/tmp/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Настройки календаря..."
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Специальная вставка..."
 
-#: po/tmp/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Создать новую встречу"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Пометить как непрочтенное"
 
-#: po/tmp/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Создать новый календарь"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "Объект"
 
-#: po/tmp/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "День"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: Элемент"
 
-#: po/tmp/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Перейти в прошлое"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Непрочитанный элемент"
 
-#: po/tmp/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Перейти в будущее"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Первый элемент в папке"
 
-#: po/tmp/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Перейти к"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: Последний элемент в папке"
 
-#: po/tmp/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Перейти к указанной дате"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: Стандартная"
 
-#: po/tmp/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Перейти к настоящему времени"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Форматирование"
 
-#: po/tmp/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Месяц"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Настройка..."
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Открыть календарь"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Пред."
+
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "След."
+
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "Панель инструментов"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: файл..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: Элемент..."
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: Объект..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: Шрифт..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: Абзац..."
 
-#: po/tmp/evolution-calendar.xml.h:22
-msgid "Prev"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Конструкция этой формы"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Отладчик скрипта"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: Правописание..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "Формы"
+
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "FIXME: Контакт"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: Контакт"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: Контакт"
+
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Контакт"
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: Правописание..."
+
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: Контакт"
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: Журнальная запись"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: Скопировать в папку..."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: Правка сообщения"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: Правка сообщения"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Переслать как v_Calendar"
+
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: Переслать"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Вставить"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "Формат"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "Инструменты"
+
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "Действия"
+
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
 msgstr "Пред."
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Напечатать этот календарь"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Перейти к предыдущему элементу"
 
-#: po/tmp/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Сохранить календарь как что-нибудь еще"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "FIXME: Запись"
 
-#: po/tmp/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Показать 1 день"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Перейти к следующему элементу"
 
-#: po/tmp/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Показать 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: po/tmp/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Показать 1 неделю"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Экспериментальный"
 
-#: po/tmp/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Показать рабочую неделю"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Занят"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: 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
+msgid "_Options"
+msgstr "Параметры"
+
+#: 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 "Все сопровождение"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "ПВСЧПСВ"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Сейчас"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Сегодня"
 
-#: po/tmp/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Неделя"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:40
-msgid "_New"
-msgstr "Новый"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: po/tmp/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "Открыть календарь"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Поиск"
 
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "Напечатать этот календарь"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Группа %i"
 
-#: po/tmp/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Удалить этот элемент"
+#~ msgid "Add Service"
+#~ msgstr "Добавить сервис"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Удалить..."
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Добавить новый сервис к Executive Summary"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Справка"
+#~ msgid "Create a new email"
+#~ msgstr "Создать новое сообщение"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Печать конверта..."
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Установки Executive Summary"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Сохранить задание и закрыть окно диалога"
+#~ msgid "New Mail"
+#~ msgstr "Новое сообщение"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "Послать контакт другому..."
+#~ msgid "About this application"
+#~ msgstr "Об этой программе"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "Послать сообщение к контакту..."
+#~ msgid "About..."
+#~ msgstr "О программе..."
 
-#: po/tmp/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "Печать..."
+#~ msgid "C_lear"
+#~ msgstr "Очистить"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Закрыть эту встречу"
+#~ msgid "C_ut"
+#~ msgstr "Вырезать"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Переслать как v_Calendar"
+#~ msgid "Clear"
+#~ msgstr "Очистить"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: Новая встреча"
+#~ msgid "Clear the selection"
+#~ msgstr "Очистить выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: Запись"
+#~ msgid "Close"
+#~ msgstr "Закрыть"
 
-#: po/tmp/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Сохранить встречу и закрыть окно диалога"
+#~ msgid "Close the current file"
+#~ msgstr "Закрыть текущий файл"
 
-#: po/tmp/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Вставить встречу в расписание"
+#~ msgid "Copy"
+#~ msgstr "Скопировать"
 
-#: po/tmp/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "Вставить встречу в расписание"
+#~ msgid "Copy the selection"
+#~ msgstr "Скопировать выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "Вставить в расписание встречу некоторого типа"
+#~ msgid "Cut"
+#~ 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 "Создать"
+#~ msgid "Cut the selection"
+#~ msgstr "Вырезать выделение"
 
-#: po/tmp/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Создать новое сообщение"
+#~ msgid "Delete this task"
+#~ msgstr "Удалить это задание"
 
-#: po/tmp/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Скопировать сообщение в новую папку"
+#~ msgid "Dump XML"
+#~ msgstr "Дамп XML"
 
-#: po/tmp/evolution-mail.xml.h:10
-msgid "Create Rule"
-msgstr "Создать правило"
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Дамп XML описания интерфейса"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "Папка"
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Адресная книга..."
 
-#: po/tmp/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Фильтр по отправителю"
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "FIXME: Связать задание"
 
-#: po/tmp/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Фильтр по получателю"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Проверка имен"
 
-#: po/tmp/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Забыть пароли"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Справка"
 
-#: po/tmp/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Получить почту"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Невыполненное задание"
 
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Hide S_elected Messages"
-msgstr "Скрыть выделенные сообщения"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Вставить файл"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted Messages"
-msgstr "Скрыть удаленные сообщения"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Повторение..."
 
-#: po/tmp/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Скрыть прочитанные сообщения"
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "FIXME: Ответить всем"
 
-#: po/tmp/evolution-mail.xml.h:24
-msgid "Mail _Filters..."
-msgstr "Почтовые фильтры..."
+#~ msgid "FIXME: S_end Status Report"
+#~ msgstr "FIXME: Послать отчет о состоянии"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Manage Subscriptions..."
-msgstr "Управление подписками..."
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "FIXME: Пропустить повторы"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Mar_k As Read"
-msgstr "Пометить как прочитанное"
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "FIXME: Пометить как выполненное"
 
-#: po/tmp/evolution-mail.xml.h:27
-msgid "Mark As U_nread"
-msgstr "Пометить как непрочтенное"
+#~ msgid "FIXME: _New Task"
+#~ msgstr "FIXME: Новая задача"
 
-#: po/tmp/evolution-mail.xml.h:28
-msgid "Move"
-msgstr "Переместить"
+#~ msgid "FIXME: _Reply"
+#~ msgstr "FIXME: Ответить"
 
-#: po/tmp/evolution-mail.xml.h:29
-msgid "Move message to a new folder"
-msgstr "Переместить сообщение в новую папку"
+#~ msgid "FIXME: _note"
+#~ msgstr "FIXME: запись"
 
-#: po/tmp/evolution-mail.xml.h:30
-msgid "Previews the message to be printed"
-msgstr "Просмотр печатаемых сообщений"
+#~ msgid "Find"
+#~ msgstr "Поиск"
 
-#: po/tmp/evolution-mail.xml.h:32
-msgid "Print Preview of message..."
-msgstr "Просмотр печати сообщения..."
+#~ msgid "Find Again"
+#~ msgstr "Повторный поиск"
 
-#: po/tmp/evolution-mail.xml.h:33
-msgid "Print message to the printer"
-msgstr "Распечатать сообщение на принтере"
+#~ msgid "Find _Again"
+#~ msgstr "Повторный поиск"
 
-#: po/tmp/evolution-mail.xml.h:34
-msgid "Print message..."
-msgstr "Печать сообщения..."
+#~ msgid "Modify the file's properties"
+#~ msgstr "Изменить свойства файла"
 
-#: po/tmp/evolution-mail.xml.h:38
-msgid "Reply to _All"
-msgstr "Ответить всем"
+#~ msgid "N_ext"
+#~ msgstr "След."
 
-#: po/tmp/evolution-mail.xml.h:39
-msgid "Reply to _Sender"
-msgstr "Ответить отправителю"
+#~ msgid "Paste"
+#~ msgstr "Вставить"
 
-#: po/tmp/evolution-mail.xml.h:42
-msgid "S_ource"
-msgstr "Источник"
+#~ msgid "Paste the clipboard"
+#~ msgstr "Вставить выделение"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Выбрать все"
+#~ msgid "Print S_etup..."
+#~ msgstr "Настройка печати..."
 
-#: po/tmp/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Отправить почту из очереди и получить новую почту"
+#~ msgid "Print Setup"
+#~ msgstr "Настройка страницы"
 
-#: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All Messages"
-msgstr "Показать все сообщения"
+#~ msgid "Print this item"
+#~ msgstr "Печать этого элемента"
 
-#: po/tmp/evolution-mail.xml.h:47
-msgid "Threaded Message list"
-msgstr "Список подшитых сообщений"
+#~ msgid "Print..."
+#~ msgstr "Печать..."
 
-#: po/tmp/evolution-mail.xml.h:48
-msgid "VFolder on Se_nder"
-msgstr "Вирт.папка по отправителю"
+#~ msgid "Properties"
+#~ msgstr "Свойства"
 
-#: po/tmp/evolution-mail.xml.h:49
-msgid "VFolder on _Recipients"
-msgstr "Вирт.папка по получателю"
+#~ msgid "Redo"
+#~ msgstr "Возврат"
 
-#: po/tmp/evolution-mail.xml.h:50
-msgid "View Raw Message Source"
-msgstr "Просмотр исходного текста сообщения"
+#~ msgid "Redo the undone action"
+#~ msgstr "Повторить отмененное действие"
 
-#: po/tmp/evolution-mail.xml.h:51
-msgid "_Apply Filters"
-msgstr "Применить фильтры"
+#~ msgid "Replace"
+#~ msgstr "Заменить"
 
-#: po/tmp/evolution-mail.xml.h:52
-msgid "_Configure Folder..."
-msgstr "Настроить папку..."
+#~ msgid "Replace a string"
+#~ msgstr "Заменить строку"
 
-#: po/tmp/evolution-mail.xml.h:53
-msgid "_Copy to Folder..."
-msgstr "Скопировать в папку..."
+#~ msgid "Save"
+#~ msgstr "Сохранить"
 
-#: po/tmp/evolution-mail.xml.h:55
-msgid "_Edit Message"
-msgstr "Правка сообщения"
+#~ msgid "Save _As..."
+#~ msgstr "Сохранить как..."
 
-#: po/tmp/evolution-mail.xml.h:56
-msgid "_Expunge"
-msgstr "Вычеркнуть"
+#~ msgid "Save and Close"
+#~ msgstr "Сохранить и закрыть"
 
-#: po/tmp/evolution-mail.xml.h:57
-msgid "_Filter on Subject"
-msgstr "Фильтр по теме"
+#~ msgid "Save the current file"
+#~ msgstr "Сохранить текущий файл"
 
-#: po/tmp/evolution-mail.xml.h:58
-msgid "_Forward"
-msgstr "Переслать"
+#~ msgid "Save the task and close the dialog box"
+#~ msgstr "Сохранить задание и закрыть окно диалога"
 
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "Обратить выделение"
+#~ msgid "Search again for the same string"
+#~ msgstr "Искать ту же строку еще раз"
 
-#: po/tmp/evolution-mail.xml.h:60
-msgid "_Mail Configuration..."
-msgstr "Настройка почты..."
+#~ msgid "Search for a string"
+#~ msgstr "Поиск строки"
 
-#: po/tmp/evolution-mail.xml.h:61
-msgid "_Message"
-msgstr "Сообщение"
+#~ msgid "See online help"
+#~ msgstr "Просмотр онлайновой справки"
 
-#: po/tmp/evolution-mail.xml.h:62
-msgid "_Move to Folder..."
-msgstr "Переместить в папку..."
+#~ msgid "Select All"
+#~ msgstr "Выбрать все"
 
-#: po/tmp/evolution-mail.xml.h:63
-msgid "_Open in New Window"
-msgstr "Открыть в новом окне"
+#~ msgid "Select everything"
+#~ msgstr "Выбрать все"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Print Message"
-msgstr "Печать сообщения"
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Настройки страницы для вашего текущего принтера"
 
-#: po/tmp/evolution-mail.xml.h:65
-msgid "_Save Message As..."
-msgstr "Сохранить сообщение как..."
+#~ msgid "Undo"
+#~ msgstr "Откат"
 
-#: po/tmp/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "Подшитые"
+#~ msgid "Undo the last action"
+#~ msgstr "Отменить последнее действие"
 
-#: po/tmp/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "Восстановить"
+#~ msgid "_About..."
+#~ msgstr "О программе..."
 
-#: po/tmp/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "Вирт.папка по теме"
+#~ msgid "_Close"
+#~ msgstr "Закрыть"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor..."
-msgstr "Редактор виртуальных папок..."
+#~ msgid "_Copy"
+#~ 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 "Присоединить"
+#~ msgid "_Debug"
+#~ msgstr "Отладка"
 
-#: po/tmp/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Зашифровать это сообщение с помощью PGP"
+#~ msgid "_Edit"
+#~ msgstr "Правка"
 
-#: po/tmp/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "_File"
+#~ msgstr "Файл"
 
-#: po/tmp/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Вставить файл как текст в сообщение"
+#~ msgid "_Find..."
+#~ msgstr "Найти..."
 
-#: po/tmp/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Вставить текстовый файл..."
+#~ msgid "_Help"
+#~ msgstr "Справка"
 
-#: po/tmp/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "Открыть файл"
+#~ msgid "_Paste"
+#~ msgstr "Вставить"
 
-#: po/tmp/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "Шифрование PGP"
+#~ msgid "_Print"
+#~ msgstr "Печать"
 
-#: po/tmp/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "Подпись PGP"
+#~ msgid "_Properties..."
+#~ msgstr "Свойства..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Сохранить как"
+#~ msgid "_Redo"
+#~ msgstr "Возврат"
 
-#: po/tmp/evolution-message-composer.xml.h:22
-msgid "Save _Draft"
-msgstr "Сохранить черновик"
+#~ msgid "_Replace..."
+#~ msgstr "Заменить..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
-msgid "Save in _folder... (FIXME)"
-msgstr "Сохранить в папке... (FIXME)"
+#~ msgid "_Save"
+#~ msgstr "Сохранить"
 
-#: po/tmp/evolution-message-composer.xml.h:24
-msgid "Save in folder..."
-msgstr "Сохранить в папке..."
+#~ msgid "_Undo"
+#~ msgstr "Откат"
 
-#: po/tmp/evolution-message-composer.xml.h:26
-msgid "Save the current file with a different name"
-msgstr "Сохранить текущий файл под другим именем"
+#~ msgid "Alter preferences"
+#~ msgstr "Другие настройки"
 
-#: po/tmp/evolution-message-composer.xml.h:27
-msgid "Save the message in a specified folder"
-msgstr "Сохранить сообщение в указанной папке"
+#~ msgid "Create a new task"
+#~ msgstr "Создать новое задание"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Отправить"
+#~ msgid "Save task as something else"
+#~ msgstr "Сохранить задание как что-нибудь еще"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-msgid "Send _Later"
-msgstr "Отправить позже"
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Настройки заданий..."
 
-#: po/tmp/evolution-message-composer.xml.h:30
-msgid "Send _later"
-msgstr "Отправить позже"
+#~ msgid "_Save As..."
+#~ msgstr "Сохранить как..."
 
-#: po/tmp/evolution-message-composer.xml.h:31
-msgid "Send the mail in HTML format"
-msgstr "Отправить почту в формате HTML"
+#~ msgid "Delete Contact?"
+#~ msgstr "Удалить контакт?"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Send the message later"
-msgstr "Отправить сообщение позже"
+#~ msgid "Address _2:"
+#~ msgstr "Адрес 2:"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-msgid "Send the message now"
-msgstr "Отправить сообщение сейчас"
+#~ msgid "Canada"
+#~ msgstr "Канада"
 
-#: po/tmp/evolution-message-composer.xml.h:34
-msgid "Send this message now"
-msgstr "Отправить это сообщение сейчас"
+#~ msgid "Check Address"
+#~ msgstr "Проверить адрес"
 
-#: po/tmp/evolution-message-composer.xml.h:35
-msgid "Show / hide attachments"
-msgstr "Показать/Скрыть вложения"
+#~ msgid "Countr_y:"
+#~ msgstr "Страна:"
 
-#: po/tmp/evolution-message-composer.xml.h:36
-msgid "Show _attachments"
-msgstr "Показать вложения"
+#~ msgid "Finland"
+#~ msgstr "Финляндия"
 
-#: po/tmp/evolution-message-composer.xml.h:37
-msgid "Show attachments"
-msgstr "Показать вложения"
+#~ msgid "USA"
+#~ msgstr "США"
 
-#: po/tmp/evolution-message-composer.xml.h:38
-msgid "Sign this message with your PGP key"
-msgstr "Подписать это сообщение с вашим PGP-ключом"
+#~ msgid "_Address:"
+#~ msgstr "Адрес:"
 
-#: po/tmp/evolution-message-composer.xml.h:45
-msgid "_Insert text file... (FIXME)"
-msgstr "Вставить текстовый файл... (FIXME)"
+#~ msgid "_City:"
+#~ msgstr "Город:"
 
-#: po/tmp/evolution-message-composer.xml.h:46
-msgid "_Open..."
-msgstr "Открыть..."
+#~ msgid "_PO Box:"
+#~ msgstr "Аб.ящик:"
 
-#: po/tmp/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "Безопасность"
+#~ msgid "_State/Province:"
+#~ 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 "Добавить папку к вашему списку папок подписок"
+#~ msgid "_ZIP Code:"
+#~ msgstr "Почтовый индекс:"
 
-#: po/tmp/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Обновить список"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Источники адресных книг"
 
-#: po/tmp/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Обновить список папок"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: po/tmp/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Удалить папку из вашего списка папок подписок"
+#~ msgid "Find..."
+#~ msgstr "Найти..."
 
-#: po/tmp/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "Подписаться"
+#~ msgid "Message Recipients"
+#~ msgstr "Получатели сообщения"
 
-#: po/tmp/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Отказаться"
+#~ msgid "Select Names"
+#~ 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 "About Evolution..."
-msgstr "О программе..."
+#~ msgid "Select name from:"
+#~ msgstr "Выбрать имена из:"
 
-#: po/tmp/evolution.xml.h:7
-msgid "Customi_ze"
-msgstr "Настроить"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: po/tmp/evolution.xml.h:8
-msgid "Customize"
-msgstr "Настроить"
+#~ msgid "a"
+#~ msgstr "a"
 
-#: po/tmp/evolution.xml.h:9
-msgid "Customize toolbars"
-msgstr "Настроить панели инструментов"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: po/tmp/evolution.xml.h:10
-msgid "Display a different folder"
-msgstr "Показать другую папку"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: po/tmp/evolution.xml.h:11
-msgid "E_xit"
-msgstr "Выход"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: po/tmp/evolution.xml.h:12
-msgid "Evolution bar _shortcut"
-msgstr "Строка ярлыков Evolution"
+#~ msgid "e"
+#~ msgstr "e"
 
-#: po/tmp/evolution.xml.h:13
-msgid "Exit"
-msgstr "Выход"
+#~ msgid "f"
+#~ msgstr "f"
 
-#: po/tmp/evolution.xml.h:14
-msgid "Exit the program"
-msgstr "Выйти из программы"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: po/tmp/evolution.xml.h:15
-msgid "Getting _Started"
-msgstr "Краткое руководство"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Import an external file format"
-msgstr "Импортировать во внешний формат файла"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: po/tmp/evolution.xml.h:17
-msgid "Main toolbar"
-msgstr "Главная панель инструментов"
+#~ msgid "j"
+#~ msgstr "j"
 
-#: po/tmp/evolution.xml.h:18
-msgid "Show information about Evolution"
-msgstr "Показать информацию о программе Evolution"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: po/tmp/evolution.xml.h:19
-msgid "Show the _Folder Bar"
-msgstr "Показать строку папок"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: po/tmp/evolution.xml.h:20
-msgid "Show the _Shortcut Bar"
-msgstr "Показать строку закладок"
+#~ msgid "m"
+#~ msgstr "m"
 
-#: po/tmp/evolution.xml.h:21
-msgid "Submit Bug Report"
-msgstr "Отправить сообщение об ошибке"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: po/tmp/evolution.xml.h:22
-msgid "Submit _Bug Report"
-msgstr "Отправить сообщение об ошибке"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: po/tmp/evolution.xml.h:23
-msgid "Submit bug report using Bug Buddy."
-msgstr "Отправить сообщение об ошибке используя Bug Buddy."
+#~ msgid "p"
+#~ msgstr "p"
 
-#: po/tmp/evolution.xml.h:24
-msgid "Toggle whether to show the folder bar"
-msgstr "Переключить отображение строки папок"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: po/tmp/evolution.xml.h:25
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Переключить отображение строки закладок"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: po/tmp/evolution.xml.h:26
-msgid "Using the C_ontact Manager"
-msgstr "Использование диспетчера контактов"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: po/tmp/evolution.xml.h:27
-msgid "Using the _Calendar"
-msgstr "Использование календаря"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: po/tmp/evolution.xml.h:28
-msgid "Using the _Mailer"
-msgstr "Использование почты"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: po/tmp/evolution.xml.h:29
-msgid "_About Evolution..."
-msgstr "О программе..."
+#~ msgid "v"
+#~ msgstr "v"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Appointment (FIXME)"
-msgstr "Встреча (FIXME)"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: po/tmp/evolution.xml.h:31
-msgid "_Contact (FIXME)"
-msgstr "Контакт (FIXME)"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: po/tmp/evolution.xml.h:34
-msgid "_Folder"
-msgstr "Папка"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: po/tmp/evolution.xml.h:35
-msgid "_Go to Folder..."
-msgstr "Перейти к папке..."
+#~ msgid "z"
+#~ msgstr "z"
 
-#: po/tmp/evolution.xml.h:37
-msgid "_Import file..."
-msgstr "Импортировать файл..."
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: po/tmp/evolution.xml.h:38
-msgid "_Index"
-msgstr "Индекс"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: po/tmp/evolution.xml.h:39
-msgid "_Mail message"
-msgstr "Почтовое сообщение"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Пустая форма в конце:"
 
-#: po/tmp/evolution.xml.h:41
-msgid "_Settings"
-msgstr "Установки"
+#~ msgid "Body"
+#~ msgstr "Тело"
 
-#: po/tmp/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "Задание (FIXME)"
+#~ msgid "Bottom:"
+#~ 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#~ msgid "Dimensions:"
+#~ msgstr "Размеры:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Экспериментальный"
+#~ msgid "Font..."
+#~ msgstr "Шрифт..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Занят"
+#~ msgid "Fonts"
+#~ msgstr "Шрифты..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Вне офиса"
+#~ msgid "Footer:"
+#~ msgstr "Сноска:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Нет информации"
+#~ msgid "Format"
+#~ msgstr "Формат"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Пригласить других..."
+#~ msgid "Header"
+#~ msgstr "Заголовок"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "Параметры"
+#~ msgid "Header/Footer"
+#~ msgstr "Заголовок/Сноска"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Показывать только рабочие часы"
+#~ msgid "Headings"
+#~ msgstr "Заголовки"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Показывать уменьшенные"
+#~ msgid "Headings for each letter"
+#~ msgstr "Заголовки для каждой буквы"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "Обновить Свободен/Занят"
+#~ msgid "Height:"
+#~ msgstr "Высота:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "<<"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Один за другим"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "Автовыбор"
+#~ msgid "Include:"
+#~ msgstr "Включить:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">>"
+#~ msgid "Landscape"
+#~ msgstr "Блокнот"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "Все люди и ресурсы"
+#~ msgid "Left:"
+#~ msgstr "Слева:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Все люди и один ресурс"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Закладки букв сбоку"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Требуемые люди"
+#~ msgid "Margins"
+#~ msgstr "Поля"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Требуемые люди и один ресурс"
+#~ msgid "Number of columns:"
+#~ msgstr "Число столбцов:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Время начала собрания:"
+#~ msgid "Options"
+#~ msgstr "Параметры"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Время завершения собрания:"
+#~ msgid "Orientation"
+#~ msgstr "Ориентация"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Все сопровождение"
+#~ msgid "Page"
+#~ msgstr "Страница"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "ПВСЧПСВ"
+#~ msgid "Paper"
+#~ msgstr "Бумага"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Paper source:"
+#~ msgstr "Источник бумаги:"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Portrait"
+#~ msgstr "Портрет"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Сейчас"
+#~ msgid "Preview:"
+#~ msgstr "Просмотр:"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Print using gray shading"
+#~ msgstr "Печать с использованием полутонов"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Обращать на четных страницах"
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Поиск"
+#~ msgid "Right:"
+#~ msgstr "Справа:"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Группа %i"
+#~ msgid "Sections:"
+#~ msgstr "Разделы:"
+
+#~ msgid "Shading"
+#~ msgstr "Полутона"
+
+#~ msgid "Size:"
+#~ msgstr "Размер:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Начинать с новой страницы"
+
+#~ msgid "Style name:"
+#~ msgstr "Название стиля:"
+
+#~ msgid "Top:"
+#~ msgstr "Сверху:"
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Width:"
+#~ msgstr "Ширина:"
+
+#~ msgid "label26"
+#~ msgstr "метка26"
+
+#~ msgid "Edit appointment"
+#~ msgstr "Правка встречи"
+
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Время дремания (минут)"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 минут"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 минут"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12-часовой (ДП/ПП)"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 минут"
+
+#~ msgid "24 hour"
+#~ msgstr "24-часовой"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 минут"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 минут"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Задержка таймера на"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Аудио Таймеры"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Гудок при возникновении окна таймера."
+
+#~ msgid "Calendar"
+#~ msgstr "Календарь"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Настройки календаря"
+
+#~ msgid "Colors"
+#~ msgstr "Цвета"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Сжать выходные дни"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Параметры навигатора дат"
+
+#~ msgid "Defaults"
+#~ msgstr "Исх.значения"
+
+#~ msgid "Display options"
+#~ msgstr "Отобразить параметры"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Разрешить краткий сон для "
+
+#~ msgid "End of day:"
+#~ msgstr "Конец дня:"
+
+#~ msgid "First day of week:"
+#~ msgstr "Первый день недели:"
+
+#~ msgid "Highlight"
+#~ msgstr "Подсвеченные дни:"
+
+#~ msgid "Items Due Today"
+#~ msgstr "Задания установленные на сегодня"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Задания установленные на сегодня:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Еще не просроченные задания"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Еще не просроченные задания:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "Просроченные задания"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Просроченные задания:"
+
+#~ msgid "Pick a color"
+#~ msgstr "Выбрать цвет"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Напоминать обо всех встречах"
+
+#~ msgid "Reminders"
+#~ msgstr "Напоминания"
+
+#~ msgid "Show"
+#~ msgstr "Показать"
+
+#~ msgid "Show appointment end times"
+#~ msgstr "Показать время окончании встречи"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Показать номера недель"
+
+#~ msgid "Start of day:"
+#~ msgstr "Начало дня:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Панель заданий"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Время до условленного"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Разделители времени:"
+
+#~ msgid "Time format:"
+#~ msgstr "Формат времени:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Видимые таймеры"
+
+#~ msgid "Work week"
+#~ msgstr "Рабочая неделя"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "минут до назначенного времени."
+
+#~ msgid "seconds."
+#~ msgstr "секунд."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Выполнения:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "Классификация:"
+
+#~ msgid "Cancelled"
+#~ msgstr "Отменено"
+
+#~ msgid "Completed"
+#~ msgstr "Выполнено"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Дата выполнения:"
+
+#~ msgid "High"
+#~ msgstr "Высокий"
+
+#~ msgid "In Progress"
+#~ msgstr "В процессе"
+
+#~ msgid "Low"
+#~ msgstr "Низкий"
+
+#~ msgid "Normal"
+#~ msgstr "Нормальный"
+
+#~ msgid "Not Started"
+#~ msgstr "Не начато"
+
+#~ msgid "S_ummary"
+#~ msgstr "Итог"
+
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Дата начала:"
+
+#~ msgid "Task"
+#~ msgstr "Задание"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Undefined"
+#~ msgstr "Неопределенное"
+
+#~ msgid "_Contacts..."
+#~ msgstr "Контакты..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "Условленная дата:"
+
+#~ msgid "_Priority:"
+#~ msgstr "Приоритет:"
+
+#~ msgid "_Status:"
+#~ msgstr "Состояние:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "диалог редактора заданий"
+
+#~ msgid "A_ll day event"
+#~ msgstr "Все события дня"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Основания встречи"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Другое повторение"
+
+#~ msgid "Days"
+#~ msgstr "Дни"
+
+#~ msgid "Every"
+#~ msgstr "Каждый"
+
+#~ msgid "Exceptions"
+#~ msgstr "Исключения"
+
+#~ msgid "Hours"
+#~ msgstr "Часы"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Почта для:"
+
+#~ msgid "Minutes"
+#~ msgstr "Минуты"
+
+#~ msgid "Modify"
+#~ msgstr "Изменить"
+
+#~ msgid "No recurrence"
+#~ msgstr "Без повторения"
+
+#~ msgid "Preview"
+#~ msgstr "Просмотр"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Личное"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Общее"
+
+#~ msgid "Recurrence"
+#~ msgstr "Повторение"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило повторения"
+
+#~ msgid "Reminder"
+#~ msgstr "Напоминание"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Простое повторение"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Итог:"
+
+#~ msgid "Time"
+#~ msgstr "Время"
+
+#~ msgid "_Audio"
+#~ msgstr "Аудио"
+
+#~ msgid "_Confidential"
+#~ msgstr "Конфиденциальное"
+
+#~ msgid "_Contacts"
+#~ msgstr "Контакты"
+
+#~ msgid "_Display"
+#~ msgstr "Отобразить"
+
+#~ msgid "_End time:"
+#~ msgstr "Время окончания:"
+
+#~ msgid "_Mail"
+#~ msgstr "Почта"
+
+#~ msgid "_Program"
+#~ msgstr "Программа"
+
+#~ msgid "_Run program:"
+#~ msgstr "Запустить программу:"
+
+#~ msgid "_Start time:"
+#~ msgstr "Время начала:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Дата начала:"
+
+#~ msgid "day(s)"
+#~ msgstr "день"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "диалог редактора событий"
+
+#~ msgid "for"
+#~ msgstr "в"
+
+#~ msgid "forever"
+#~ msgstr "всегда"
+
+#~ msgid "label21"
+#~ msgstr "метка26"
+
+#~ msgid "month(s)"
+#~ msgstr "месяц"
+
+#~ msgid "until"
+#~ msgstr "до"
+
+#~ msgid "week(s)"
+#~ msgstr "неделя"
+
+#~ msgid "year(s)"
+#~ msgstr "год"
+
+#~ msgid "April"
+#~ msgstr "Апрель"
+
+#~ msgid "August"
+#~ msgstr "Август"
+
+#~ msgid "December"
+#~ msgstr "Декабрь"
+
+#~ msgid "February"
+#~ msgstr "Февраль"
+
+#~ msgid "Go To Date"
+#~ msgstr "Перейти к дате"
+
+#~ msgid "Go To Today"
+#~ msgstr "Сегодня"
+
+#~ msgid "January"
+#~ msgstr "Январь"
+
+#~ msgid "July"
+#~ msgstr "Июль"
+
+#~ msgid "June"
+#~ msgstr "Июнь"
+
+#~ msgid "March"
+#~ msgstr "Март"
+
+#~ msgid "May"
+#~ msgstr "Май"
+
+#~ msgid "November"
+#~ msgstr "Ноябрь"
+
+#~ msgid "October"
+#~ msgstr "Октябрь"
+
+#~ msgid "September"
+#~ msgstr "Сентябрь"
+
+#~ msgid "Attachment properties"
+#~ msgstr "Свойства вложения"
+
+#~ msgid "File name:"
+#~ msgstr "Имя файла:"
+
+#~ msgid "MIME type:"
+#~ msgstr "Тип MIME:"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Правка вирт.папок"
+
+#~ msgid "Filter Rules"
+#~ msgstr "Правила фильтра"
+
+#~ msgid "Incoming"
+#~ msgstr "Входящие"
+
+#~ msgid "Outgoing"
+#~ msgstr "Исходящие"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Виртуальные папки"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "Источники вирт.папки"
+
+#~ msgid "Current store format:"
+#~ msgstr "Текущий формат хранения:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Формат почтового ящика"
+
+#~ msgid "New store format:"
+#~ msgstr "Новый формат хранения:"
+
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr ""
+#~ "Внимание: при преобразовании между форматами почтовых ящиков, ошибка\n"
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "Account"
+#~ msgstr "Счет"
+
+#~ msgid "Account Information"
+#~ msgstr "Информация о счете"
+
+#~ msgid "Account Management"
+#~ msgstr "Управление счетами"
+
+#~ msgid "Account Properties"
+#~ msgstr "Свойства счета"
+
+#~ msgid "Advanced"
+#~ msgstr "Расширенные"
+
+#~ msgid "Authentication"
+#~ msgstr "Идентификация"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Тип идентификации"
+
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Поздравляем, настройка почты завершена.\n"
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Сделано"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "Эл.адрес:"
+
+#~ msgid "Email Address:"
+#~ msgstr "Эл.адрес:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Настройка почты Evolution"
+
+#~ msgid "Full Name:"
+#~ msgstr "Полное имя:"
+
+#~ msgid "Hostname:"
+#~ msgstr "Имя хоста:"
+
+#~ msgid "Identity"
+#~ msgstr "Именование"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Входящий почтовый сервер"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Сохранять почту на сервере"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "Почта"
+
+#~ msgid "Mail Account"
+#~ msgstr "Почтовый счет"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Настройка почты"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Помощник по настройке почты"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Сделать моим счетом по умолчанию"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Разное"
+
+#~ msgid "News"
+#~ msgstr "Новые"
+
+#~ msgid "Optional"
+#~ msgstr "Дополнительные"
+
+#~ msgid "Organization:"
+#~ msgstr "Организация:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Исходящий почтовый сервер"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Простой текст"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Получение эл.почты"
+
+#~ msgid "Remember my password"
+#~ msgstr "Запомнить мой пароль"
+
+#~ msgid "Required"
+#~ msgstr "Требуемый"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Сохранить пароль"
+
+#~ msgid "Select signature file"
+#~ msgstr "Выбрать файл подписи"
+
+#~ msgid "Sending Email"
+#~ msgstr "Отправка эл.почты"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Настройка сервера"
+
+#~ msgid "Server Type: "
+#~ msgstr "Тип сервера:"
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Сервер требует идентификации"
+
+#~ msgid "Servers"
+#~ msgstr "Серверы"
+
+#~ msgid "Signature file:"
+#~ msgstr "Файл подписи:"
+
+#~ msgid "Signature:"
+#~ msgstr "Подпись:"
+
+#~ msgid "Sources"
+#~ msgstr "Источники"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Этот сервер требует защищенного подключения (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Введите название, по которому вы хотите указывать эти серверы. Например: "
+#~ "\"Работа\" или \"Дом\"."
+
+#~ msgid "User Information"
+#~ msgstr "Информация о пользователе"
+
+#~ msgid "Username:"
+#~ msgstr "Имя пользователя:"
+
+#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ msgstr "Добро пожаловать к помощнику по настройке почты в Evolution.\n"
+
+#~ msgid "Create a new contact"
+#~ msgstr "Создать новый контакт"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Удалить контакт"
+
+#~ msgid "Find a contact"
+#~ msgstr "Поиск контакта"
+
+#~ msgid "Print contacts"
+#~ msgstr "Печать контактов"
+
+#~ msgid "Stop"
+#~ msgstr "Стоп"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Остановить загрузку"
+
+#~ msgid "View All"
+#~ msgstr "Просмотреть все"
+
+#~ msgid "View all contacts"
+#~ msgstr "Просмотреть все контакты"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Настройка адресной книги..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Напечатать контакты..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "Поиск контактов"
+
+#~ msgid "5 Days"
+#~ msgstr "5 дней"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Календарь"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Настройки календаря..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Создать новую встречу"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Создать новый календарь"
+
+#~ msgid "Day"
+#~ msgstr "День"
+
+#~ msgid "Go back in time"
+#~ msgstr "Перейти в прошлое"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Перейти в будущее"
+
+#~ msgid "Go to"
+#~ msgstr "Перейти к"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Перейти к указанной дате"
+
+#~ msgid "Go to present time"
+#~ msgstr "Перейти к настоящему времени"
+
+#~ msgid "Month"
+#~ msgstr "Месяц"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Открыть календарь"
+
+#~ msgid "Prev"
+#~ msgstr "Пред."
+
+#~ msgid "Print this calendar"
+#~ msgstr "Напечатать этот календарь"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Сохранить календарь как что-нибудь еще"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Показать 1 день"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Показать 1 месяц"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Показать 1 неделю"
+
+#~ msgid "Show the working week"
+#~ msgstr "Показать рабочую неделю"
+
+#~ msgid "Week"
+#~ msgstr "Неделя"
+
+#~ msgid "_New"
+#~ msgstr "Новый"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Открыть календарь"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Напечатать этот календарь"
+
+#~ msgid "Delete this item"
+#~ msgstr "Удалить этот элемент"
+
+#~ msgid "Delete..."
+#~ msgstr "Удалить..."
+
+#~ msgid "Help"
+#~ msgstr "Справка"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Печать конверта..."
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Сохранить задание и закрыть окно диалога"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Послать контакт другому..."
+
+#~ msgid "Send _message to contact..."
+#~ msgstr "Послать сообщение к контакту..."
+
+#~ msgid "_Print..."
+#~ msgstr "Печать..."
+
+#~ msgid "Close this appointment"
+#~ msgstr "Закрыть эту встречу"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: Новая встреча"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Сохранить встречу и закрыть окно диалога"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Вставить встречу в расписание"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Вставить встречу в расписание"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Вставить в расписание встречу некоторого типа"
+
+#~ msgid "Compose"
+#~ msgstr "Создать"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Создать новое сообщение"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Скопировать сообщение в новую папку"
+
+#~ msgid "Create Rule"
+#~ msgstr "Создать правило"
+
+#~ msgid "F_older"
+#~ msgstr "Папка"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Фильтр по отправителю"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Фильтр по получателю"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Забыть пароли"
+
+#~ msgid "Get Mail"
+#~ msgstr "Получить почту"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Скрыть выделенные сообщения"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Скрыть удаленные сообщения"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Скрыть прочитанные сообщения"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "Почтовые фильтры..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Управление подписками..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Пометить как прочитанное"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Пометить как непрочтенное"
+
+#~ msgid "Move"
+#~ msgstr "Переместить"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Переместить сообщение в новую папку"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Просмотр печатаемых сообщений"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Просмотр печати сообщения..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Распечатать сообщение на принтере"
+
+#~ msgid "Print message..."
+#~ msgstr "Печать сообщения..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Ответить всем"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Ответить отправителю"
+
+#~ msgid "S_ource"
+#~ msgstr "Источник"
+
+#~ msgid "Select _All"
+#~ msgstr "Выбрать все"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Отправить почту из очереди и получить новую почту"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Показать все сообщения"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "Список подшитых сообщений"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Вирт.папка по отправителю"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Вирт.папка по получателю"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Просмотр исходного текста сообщения"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Применить фильтры"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "Настроить папку..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "Скопировать в папку..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "Правка сообщения"
+
+#~ msgid "_Expunge"
+#~ msgstr "Вычеркнуть"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "Фильтр по теме"
+
+#~ msgid "_Forward"
+#~ msgstr "Переслать"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Обратить выделение"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Настройка почты..."
+
+#~ msgid "_Message"
+#~ msgstr "Сообщение"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "Переместить в папку..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "Открыть в новом окне"
+
+#~ msgid "_Print Message"
+#~ msgstr "Печать сообщения"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Сохранить сообщение как..."
+
+#~ msgid "_Threaded"
+#~ msgstr "Подшитые"
+
+#~ msgid "_Undelete"
+#~ msgstr "Восстановить"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "Вирт.папка по теме"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Редактор виртуальных папок..."
+
+#~ msgid "Attach"
+#~ msgstr "Присоединить"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Зашифровать это сообщение с помощью PGP"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Вставить файл как текст в сообщение"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Вставить текстовый файл..."
+
+#~ msgid "Open a file"
+#~ msgstr "Открыть файл"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Шифрование PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Подпись PGP"
+
+#~ msgid "Save As"
+#~ msgstr "Сохранить как"
+
+#~ msgid "Save _Draft"
+#~ msgstr "Сохранить черновик"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Сохранить в папке... (FIXME)"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Сохранить в папке..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Сохранить текущий файл под другим именем"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Сохранить сообщение в указанной папке"
+
+#~ msgid "Send"
+#~ msgstr "Отправить"
+
+#~ msgid "Send _Later"
+#~ msgstr "Отправить позже"
+
+#~ msgid "Send _later"
+#~ msgstr "Отправить позже"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Отправить почту в формате HTML"
+
+#~ msgid "Send the message later"
+#~ msgstr "Отправить сообщение позже"
+
+#~ msgid "Send the message now"
+#~ msgstr "Отправить сообщение сейчас"
+
+#~ msgid "Send this message now"
+#~ msgstr "Отправить это сообщение сейчас"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Показать/Скрыть вложения"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Показать вложения"
+
+#~ msgid "Show attachments"
+#~ msgstr "Показать вложения"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Подписать это сообщение с вашим PGP-ключом"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Вставить текстовый файл... (FIXME)"
+
+#~ msgid "_Open..."
+#~ msgstr "Открыть..."
+
+#~ msgid "_Security"
+#~ msgstr "Безопасность"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Добавить папку к вашему списку папок подписок"
+
+#~ msgid "Refresh List"
+#~ msgstr "Обновить список"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Обновить список папок"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Удалить папку из вашего списка папок подписок"
+
+#~ msgid "Subscribe"
+#~ msgstr "Подписаться"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Отказаться"
+
+#~ msgid "About Evolution..."
+#~ msgstr "О программе..."
+
+#~ msgid "Customi_ze"
+#~ msgstr "Настроить"
+
+#~ msgid "Customize"
+#~ msgstr "Настроить"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Настроить панели инструментов"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Показать другую папку"
+
+#~ msgid "E_xit"
+#~ msgstr "Выход"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Строка ярлыков Evolution"
+
+#~ msgid "Exit"
+#~ msgstr "Выход"
+
+#~ msgid "Exit the program"
+#~ msgstr "Выйти из программы"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Краткое руководство"
+
+#~ msgid "Import an external file format"
+#~ msgstr "Импортировать во внешний формат файла"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Главная панель инструментов"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Показать информацию о программе Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Показать строку папок"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Показать строку закладок"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Отправить сообщение об ошибке"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Отправить сообщение об ошибке"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Отправить сообщение об ошибке используя Bug Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Переключить отображение строки папок"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Переключить отображение строки закладок"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Использование диспетчера контактов"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Использование календаря"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Использование почты"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "О программе..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Встреча (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Контакт (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "Папка"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "Перейти к папке..."
+
+#~ msgid "_Import file..."
+#~ msgstr "Импортировать файл..."
+
+#~ msgid "_Index"
+#~ msgstr "Индекс"
+
+#~ msgid "_Mail message"
+#~ msgstr "Почтовое сообщение"
+
+#~ msgid "_Settings"
+#~ msgstr "Установки"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Задание (FIXME)"
diff --git a/po/sl.po b/po/sl.po
index e981ceeaf8..db33b8f3e4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andraz Tori <andraz.tori1@guest.arnes.si> 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,11 +14,187 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne morem inicializirati Evolution komponente za po╧to."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Nisem mogel inicializirati Bonoba"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Avtorske pravice pridr╬ane 1999,2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+#, fuzzy
+msgid "UNIX mbox-format mail files"
+msgstr "UNIX mbox-oblikovane po╧tne datoteke"
+
+#: camel/providers/local/camel-mbox-provider.c:36
+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."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Ni tak╧nega gostitelja %s."
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Pobiram po╧to iz %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Zapri"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Prestavi v mapo"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Pojdi na prej╧nji predmet"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Pojdi na naslednji predmet"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Nastavi mapo"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nisem mogel odpreti datoteke: %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Napaka ob branju po╧tne datoteke: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Brez napak"
+
+#: mail/mail-config.c:799
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Preizkusi povezavo z \"%s\""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Nisem se mogel povezati s stre╬nikom POP na %s."
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Nov"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Ustvari nov stik"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Ne morem inicializirati Evolution komponente za po╧to."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Nisem mogel inicializirati Bonoba"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +202,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +210,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +218,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +226,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +234,7 @@ msgstr ""
 "\n"
 "  Dru╬insko:     "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +242,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +250,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +258,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +266,7 @@ msgstr ""
 "\n"
 "  Po╧tni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +274,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +282,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +290,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +298,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +306,7 @@ msgstr ""
 "\n"
 "  Po╧tna ╧tevilka: "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +314,7 @@ msgstr ""
 "\n"
 "  Dr╬ava:      "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +322,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +330,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +338,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +346,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +354,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +362,7 @@ msgstr ""
 "\n"
 "Po╧tni program: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +370,7 @@ msgstr ""
 "\n"
 "хasovna cona: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +378,7 @@ msgstr ""
 "\n"
 "Geografski polo╬aj: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +386,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +394,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +402,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +410,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +418,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +426,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +434,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +442,7 @@ msgstr ""
 "\n"
 "Categorije: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +460,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +468,7 @@ msgstr ""
 "\n"
 "EnoliХen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -300,17 +476,6 @@ msgstr ""
 "\n"
 "Javni kljuХ: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Nisem mogel inicializirati Bonoba"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -430,40 +595,32 @@ msgstr ""
 "Ob prena╧anju seznama pilotov s gnome-pilot\n"
 "daemona se je zgodila napaka"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel nalo╬iti\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni nalo╬ena\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati stre╬nika wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Zbri╧i stik?"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -473,7 +630,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Zbri╧i"
 
@@ -486,14 +643,7 @@ msgstr "Tipi telefonov"
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Dodaj"
 
@@ -551,7 +701,6 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -568,8 +717,6 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Splo╧no"
 
@@ -614,24 +761,27 @@ msgid "No_tes:"
 msgstr "Opom_be:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Podrobnosti"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "PomoХnik"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Slu╬ba"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Slu╬ba"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Slu╬beni faks"
 
@@ -640,6 +790,7 @@ msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Avto"
 
@@ -649,28 +800,33 @@ msgstr "Podjetje"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Doma 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "DomaХi faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Drugo"
 
@@ -679,10 +835,12 @@ msgid "Other Fax"
 msgstr "Drugi faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Pozivnik"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Prvi"
 
@@ -699,62 +857,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "E-naslov 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "E-naslov 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Naslov _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Preveri naslov"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Dr╬a_va:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Finska"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "ZDA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "_Naslov:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "_Mesto:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "_Po╧tni predal:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "_Dr╬ava/Provinca:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Po╧tna ╧tevilka:"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -820,12 +932,7 @@ msgstr "P_ripona:"
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Kot tabelo"
 
@@ -858,32 +965,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:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Show All"
 msgstr "Ka╬i"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "Dodaj..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Any field contains"
 msgstr "Telo vsebuje"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 #, fuzzy
 msgid "Name contains"
 msgstr "vsebuje"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "vsebuje"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
@@ -912,9 +1019,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Geslo"
 
@@ -951,12 +1058,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Ur"
@@ -976,12 +1081,10 @@ msgid "Search Scope:"
 msgstr "I╧Хi"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Avtentikacija:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pot:"
 
@@ -1007,193 +1110,89 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Ime:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Dodaj izvor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Zbri╧i"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-#, fuzzy
-msgid "URI"
-msgstr "URL"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Poi╧Хi..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Prejemniki sporoХila"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "Select name from:"
-msgstr "Izberi ime s seznama:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "I╧Хi"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Ime"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "E-naslov 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organizacija"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "O_ddelek:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "Pi_sarna:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Naziv:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Poklic:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Pozivnik"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Vzdevek:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_Partner(ka):"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Brez"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Shrani kot vVizitko"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1207,179 +1206,6 @@ msgstr ""
 "\n"
 "хe ╬elite ustvariti nov stik, dvojno kliknite tu.."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 pik Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 pik Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Prazni obrazci na koncu:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Telo"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Spodaj:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Mere:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Pisava..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Pisave"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Noga:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Oblika izpisa"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Glava"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Glava/noga"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Zaglavja"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Zaglavja za vsako Хrko"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Vi╧ina:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Si sledijo takoj"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "VkljuХi:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Le╬eХe"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Levo:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Uhlji Хrk ob strani"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Robovi"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "╘tevilo stolpcev:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Mo╬nosti"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Usmerjenost"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Stran"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Nastavitev strani:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Papir"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Izvor papirja:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "PokonХno"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Predogled:"
-
-#: addressbook/printing/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:37
-msgid "Reverse on even pages"
-msgstr "Obratno na sodih straneh"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Desno:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Sekcije:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "SenХenje"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Velikost:"
-
-#: addressbook/printing/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:43
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Zgoraj:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Tip:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "╘irina:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "oznaХba26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolucijin koledarski veznik"
@@ -1388,13 +1214,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:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s koledarskim stre╬nikom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -1406,73 +1232,17 @@ 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Koledar"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Ne morem inicializirati Evolution komponente za povzemanje po╧te."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin koledarski veznik"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Opomin na zmenek ob "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Podalj╧ek spanja"
 
@@ -1482,25 +1252,25 @@ msgstr "Podalj╧ek spanja"
 msgid "Ok"
 msgstr "V redu"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Datoteke ni mogoХe najti"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1508,60 +1278,57 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr "Osebno"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr "Zaupno"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr "Neznano"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1573,7 +1340,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1581,27 +1348,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1611,861 +1378,422 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 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:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vkljuХno 1 in 9"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "_Prikaz"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Ka╬i Хase koncev zmenkov"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Ka╬i priloge"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Obvestilo o va╧em zmenku na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Zapri"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "хas podalj╧ka spanja (minut)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 urna"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 minut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr "Alarmi preteХejo po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "ZvoХni alarmi"
-
-#: calendar/gui/dialogs/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:16
-msgid "Calendar"
-msgstr "Koledar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Nastavitve koledarja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Barve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr "SkrХi vikende"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr "Mo╬nosti navigatorja datumov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr "Poka╬i mo╬nosti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/dialogs/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:25
-msgid "End of day:"
-msgstr "Konec dneva:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Prvi dan tedna:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "pet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "petek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr "Osvetlji:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr "Predmeti z dana╧njim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
-
-#: calendar/gui/dialogs/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:33
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "ponedeljek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr "Predmeti s prekoraХenim rokom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoraХenim rokom:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Izberi barvo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: calendar/gui/dialogs/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:41
-msgid "Reminders"
-msgstr "Opozorila"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "sob"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "sobota"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Ka╬i"
-
-#: calendar/gui/dialogs/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:46
-msgid "Show week numbers"
-msgstr "Ka╬i ╧tevilke tednov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "ZaХetek dneva:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "ned"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "nedeljo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "Naloge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Хet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Хetrtek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "хas do preteka"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "хasovne delitve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Oblika izpisa Хasa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "torek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "sre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "sreda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Delavni teden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr "sekundah."
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Ste prepriХani, da \n"
 "╬elite izbrisati ta stik?"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% konХa_no:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "_Uvrstitev"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "KonХano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "KonХano dne:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Visoka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "V teku"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Nizka"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Brez"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "ObiХajna"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Ni priХeto"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "_Povzetek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr "Datum _priХetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Naloga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr "_Do datuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "_Prioriteta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "_Stanje:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr "dialog-urejevalnik-dogodkov"
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Uredi nalogo"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zmenek - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "Shranil bom spremembe sporoХila"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "kategorije"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Uvrstitev"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "KonХano"
+
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
+msgstr "Datum konca"
+
+#: calendar/gui/e-calendar-table.c:158
+msgid "Start Date"
+msgstr "Datum priХetka"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Do datuma"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr "Zemljepisna lega"
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "OznaХi nalogo kot opravljeno"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "_Povzetek"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Prozorno"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmi"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Odpri..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Odpri nalogo"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "OznaХi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "OznaХi nalogo kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Zbri╧i"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Zbri╧i nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Zbri╧i ta zmenek"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Zbri╧i to pojavitev"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Zbri╧i vse pojavitve"
 
-#. 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"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr "_Celodnevni dogodek"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Uvrstitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Vsak"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "Izjeme"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Ur"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "Po╧lji po╧to _za:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Minut"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Ni ponovitev"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Preview"
-msgstr "Predogled:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "Pri_vatno"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "_Javno"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "Ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "Opozorilo"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "хas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "_Zvok"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr "_Zaupno"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr "_Prikaz"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "_хas konca"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "_Po╧lji po╧to"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "_Po╬eni program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "_хas priХetka:"
+msgid "Category:"
+msgstr ""
+"\n"
+"Categorije: "
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Datum _priХetka:"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Nisem mogel nalo╬iti koledarja v `%s'"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
-msgstr "dni"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoda potrebna za nalo╬itev `%s' ni podprta"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "dialog-urejevalec-dogodkov"
+#. 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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr "za"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr "vseskozi"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "oznaХba21"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dan"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "mesec"
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "ponedeljek"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "do"
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "torek"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "tednov"
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "sreda"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "let"
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Хetrtek"
 
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "petek"
 
-#: calendar/gui/event-editor.c:403
-msgid "on"
-msgstr "na"
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "sobota"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dan"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "nedeljo"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "mesec"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nisem mogel nalo╬iti koledarja v `%s'"
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nisem mogel ustvariti koledarja v `%s'"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"Nisem mogel odpreti imenika `%s':\n"
+"%s"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr "Metoda potrebna za nalo╬itev `%s' ni podprta"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "april"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "avgust"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "februar"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Pojdi na datum"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "Pojdi na danes"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "januar"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "julij"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "ned"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "junij"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "pon"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "marec"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "tor"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "ponedeljek"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "sre"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "november"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Хet"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "pet"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "september"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "sob"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -2658,10 +1986,15 @@ msgstr "Trenutno leto (%Y)"
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "URI, ki naj ga prika╬e brskalnik map"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "PTSхPSN"
@@ -2754,61 +2087,69 @@ msgstr "Nisem mogel nalo╬iti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel nalo╬iti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "stre╬nik %s %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Preklicano"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Odpri koledar"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabni╧kega imena"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Ni tak╧nega gostitelja %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2817,17 +2158,17 @@ msgstr ""
 "Ne morem ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL niz '%s' ne vsebuje protokola"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL niz '%s' vsebuje neveljaven protokol"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "╘tevilka vrat v URL '%s' ni numeriХna"
@@ -2844,41 +2185,42 @@ msgstr "Nisem mogel ustvariti cevi: %s"
 msgid "Bad authentication response from server."
 msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "odgovor IMAP stre╬nika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, 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:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NepriХakovan OK odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel nalo╬iti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporoХila v FETCH odgovoru."
 
@@ -2890,26 +2232,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje po╧te na IMAP stre╬nikih."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta mo╬nost se bo povezala z IMAP stre╬nikom z ne╧ifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Ta mo╬nost se bo povezala z IMAP stre╬nikom s Kerberos 4 avtentifikacijo."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpi╧ite IMAP geslo za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2920,14 +2262,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
 #, fuzzy
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr "UNIX MH-oblika po╧tnih imenikov"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2935,9 +2277,8 @@ 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"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
@@ -2945,7 +2286,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3288,8 +2629,8 @@ msgid ""
 msgstr ""
 "Ta mo╬nost se bo avtentificirala pri stre╬niku NNTP z ne╧ifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -3321,7 +2662,7 @@ msgstr ""
 "prena╧anje po╧te iz nekaterih spletnih nuditeljev po╧te in zaprtih sistemov "
 "e-po╧te"
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3329,7 +2670,7 @@ msgstr ""
 "Ta mo╬nost se bo povezala s stre╬nikom POP z ne╧ifriranim geslom. To je v "
 "veХini edina mo╬nost, ki jo stre╬niki POP podpirajo."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3339,29 +2680,29 @@ msgstr ""
 "protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo za "
 "stre╬nike, ki trdijo, da jo podpirajo"
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "To se bo povezalo s stre╬nikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nisem se mogel avtentificirati do stre╬nika KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s stre╬nikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpi╧ite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3370,12 +2711,12 @@ msgstr ""
 "Nisem se mogel povezati s stre╬nikom POP.\n"
 "Napaka ob po╧iljanju uporabni╧kega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3383,7 +2724,7 @@ msgstr ""
 "Ne morem se povezati s stre╬nikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3392,13 +2733,12 @@ msgstr ""
 "Nisem se mogel povezati s stre╬nikom POP.\n"
 "Napaka ob po╧iljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni tak╧ne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -3448,29 +2788,24 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava po╧te preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
 #, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Za dostavo po╧te preko povezave z oddaljenim po╧tnim razdelilcem z uporabo "
 "SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "Avtentikacija:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -3479,109 +2814,108 @@ msgstr ""
 "Ta mo╬nost se bo povezala s stre╬nikom POP z ne╧ifriranim geslom. To je v "
 "veХini edina mo╬nost, ki jo stre╬niki POP podpirajo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Ta mo╬nost se bo povezala z IMAP stre╬nikom s Kerberos 4 avtentifikacijo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "stre╬nik %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava po╧te preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Nisem mogel izvr╧iti %s: po╧ta ni bila poslana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Nisem mogel izvr╧iti %s: po╧ta ni bila poslana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "program sendmail je zakljuХil s signalom %s: po╧ta ni bila poslana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3624,12 +2958,11 @@ msgid "attachment"
 msgstr "priloga"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Prilo╬i datoteko"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -3645,56 +2978,40 @@ msgstr "Dodaj prilogo..."
 msgid "Attach a file to the message"
 msgstr "Prilo╬i datoteko k sporoХilu"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Lastnosti priloge"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Ime datoteke:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "MIME tip:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporoХila"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3702,11 +3019,11 @@ 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo sproХila"
 
@@ -3719,38 +3036,38 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napak ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3760,27 +3077,27 @@ msgstr ""
 "\n"
 "╝elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "To ni obiХajna datoteka."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3788,27 +3105,22 @@ msgstr ""
 "Datoteka je zelo velika (Хez 100K).\n"
 "Ste prepriХani,da jo ╬elite vstaviti?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Sestavi novo sporoХilo"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 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 "year"
 msgstr "leto"
@@ -3942,7 +3254,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Grupiranje"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
@@ -4045,193 +3357,170 @@ msgstr ""
 msgid "Read"
 msgstr "Obnovi"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Uredi vMape"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
-
-#: filter/filter.glade.h:12
-#, fuzzy
-msgid "Incoming"
-msgstr ""
-"Prihodna\n"
-"Odhodna\n"
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "Obroba:"
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "Virtualne mape"
-
-#: filter/filter.glade.h:16
-msgid "vFolder Sources"
-msgstr "Viri vMap"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Pripi╧i barvo"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Pripi╧i toХke"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "pred"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Poslano dne"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Izraz"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Posreduj na naslove"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Jedro sporoХila"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "ne vsebuje"
+#, fuzzy
+msgid "Message Header"
+msgstr "Jedro sporoХila"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "se ne konХa z"
+msgid "Message was received"
+msgstr "SporoХilo je bilo sprejeto"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "ne obstaja"
+msgid "Message was sent"
+msgstr "SporoХilo je bilo poslano"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "ne zveni kot"
+msgid "Move to Folder"
+msgstr "Prestavi v mapo"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "se ne zaХne z"
+msgid "Recipients"
+msgstr "Prejemniki"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "se konХa z"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "obstaja"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "ToХke"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Izraz"
+msgid "Sender"
+msgstr "Po╧iljatelj"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
+#, fuzzy
+msgid "Set Status"
+msgstr "Stanje priklopa"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "je"
+msgid "Source"
+msgstr "Vir"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "je veХje"
+msgid "Specific header"
+msgstr "DoloХena glava"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "je manj╧e"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "_Stanje:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "ni"
+msgid "Stop Processing"
+msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Jedro sporoХila"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Zadeva"
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "Message Header"
-msgstr "Jedro sporoХila"
+msgid "after"
+msgstr "po"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "SporoХilo je bilo sprejeto"
+msgid "before"
+msgstr "pred"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "SporoХilo je bilo poslano"
+msgid "contains"
+msgstr "vsebuje"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Prestavi v mapo"
+msgid "does not contain"
+msgstr "ne vsebuje"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "na ali po"
+msgid "does not end with"
+msgstr "se ne konХa z"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "na ali pred"
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "ne zveni kot"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Prejemniki"
+msgid "does not start with"
+msgstr "se ne zaХne z"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "se konХa z"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Po╧iljatelj"
+msgid "exists"
+msgstr "obstaja"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "Stanje priklopa"
+msgid "is greater than"
+msgstr "je veХje"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "zveni kot"
+msgid "is less than"
+msgstr "je manj╧e"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Vir"
+msgid "is not"
+msgstr "ni"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "DoloХena glava"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "se zaХne z"
+msgid "on or after"
+msgstr "na ali po"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "_Stanje:"
+msgid "on or before"
+msgstr "na ali pred"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Prenehaj z obdelavo"
+msgid "sounds like"
+msgstr "zveni kot"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Zadeva"
+msgid "starts with"
+msgstr "se zaХne z"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4249,10 +3538,6 @@ msgstr "Dodaj pravilo"
 msgid "Edit Score Rule"
 msgstr "Uredi pravilo toХk"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "ToХke"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Dodaj pravilo vMape"
@@ -4261,222 +3546,170 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolution komponente za po╧to."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Shrani"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Izberi mapo"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "vMapa glede na Po╧iljatelja"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filter glede na Po╧iljatelja"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filter glede na Prejemnike"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Po╧tni seznam"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Ka╬i"
-
-#: mail/folder-browser.c:657
-#, fuzzy
-msgid "Hide selected"
-msgstr "Zbrisano"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Skrij"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Zbrisano"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Zadeva"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Filter glede na Po╧iljatelja"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_Odpri"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Uredi"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "Shrani _kot..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Natisni"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Odgovori po╧iljatelju"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Pojdi po Хasu naprej"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "OznaХi kot prebrano"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "OznaХi kot neprebrano"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, fuzzy
 msgid "Undelete"
 msgstr "Zbri╧i"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Uredi sporoХilo"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po╧tni seznam (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Zadeva je %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Dobi shrambo za \"%s\""
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "Povzetek po╧tnega predala"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Brez"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "Tip izvora noviХk:"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "Privzeto"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Evolucijin veznik za-opravit"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4498,7 +3731,7 @@ msgstr "Po╧ta od %s"
 msgid "%s mailing list"
 msgstr "%s po╧tnih seznamov"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4510,7 +3743,7 @@ msgstr ""
 "ali skladate po╧to.\n"
 "Bi ga ╬eleli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4518,7 +3751,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate po╧to."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4526,19 +3759,15 @@ msgstr ""
 "Nastaviti morate naХin prenosa po╧te\n"
 "preden lahko skladate po╧to."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "Nimate nastavljenih izvorov po╧te"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili metode prena╧anja po╧te"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Nimate nastavljenega Izhodnega po╧tnega predala"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4546,24 +3775,31 @@ msgstr ""
 "To poroХilo nima 'zadeve'.\n"
 "ResniХno po╧lji?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Nastaviti morate sovjo identiteto\n"
+"preden lahko skladate po╧to."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, Хe ╬eliti poslati sporoХilo."
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Prestavi sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4571,11 +3807,11 @@ msgstr ""
 "Urejate lahko le sporoХila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Prepi╧i datoteko?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4583,17 +3819,17 @@ msgstr ""
 "Mapa z enakim imenom ╬e obstaja.\n"
 "Naj jo prepi╧em?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Shrani kot..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Shrani kot..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4602,477 +3838,32 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 " %s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Natisni sporoХilo"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Tiskanje sporoХila ni uspelo"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Ni podatkov"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Lastnosti priloge"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Dodaj..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "Avtentikacija:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "Avtentikacija:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Privzeto"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Ne zbri╧i sporoХil s stre╬nika"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Brez"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "E-po╧tni naslov:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "E-po╧tni naslov:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Nastavitev _po╧te"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Polno ime:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Uporabni╧ko ime:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Identiteta"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_Po╧lji po╧to"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "vsebuje"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "Nastavitev _po╧te"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Nastavitev _po╧te"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Nov"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Mo╬nosti"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "Geslo"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Odgovori-na:"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "_Potrebni ljudje"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Shrani kot vVizitko"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Datoteka s podpisom:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Program sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Nastavitev _po╧te"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Stre╬nik:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Stre╬nik:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Datoteka s podpisom:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Datoteka s podpisom:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Viri"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Tip:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Ni podatkov"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Uporabni╧ko ime:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "minut"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"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 ""
-"Vnesite svoje ime in e-po╧tni naslov, ki naj se uporablja v izhodni po╧ti Po "
-"╬elji lahko vnesete tudi ime va╧e organizacije in ime datoteke iz katere naj "
-"se prebere va╧ podpis."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Polno ime:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "E-po╧tni naslov:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Datoteka s podpisom"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Stre╬nik:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Ugotovi podprte tipe..."
-
-#: 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:1003
-msgid "Test Settings"
-msgstr "Preveri nastavitve"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Tip izvora po╧te:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:363
+#, c-format
 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."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
-"potrebne podatke.\n"
-"\n"
-"хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-"podprte tipe...\" potem, ko boste vnesli ostale podatke."
-
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Tip izvora noviХk:"
 
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:629
+#, c-format
 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."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
-"potrebne podatke.\n"
-"\n"
-"хe stre╬nik potrebuje avtentikacijo, lako kliknete na gumb \"Ugotovi podprte "
-"tipe...\", po tem ko boste vnesli ostale podatke."
-
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Tip prenosa po╧te:"
 
-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
-"Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
-"potrebne podatke.\n"
-"\n"
-"хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-"podprte tipe...\" potem, ko boste vnesli ostale podatke."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Dodaj identiteto"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Uredi identiteto"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Dodaj izvor"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Uredi izbor"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Dodaj noviХarski stre╬nik"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Uredi noviХarski stre╬nik"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Preizku╧am \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Preizkusi povezavo z \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Povezava je bila uspe╧na!"
-
-#: 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:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Poizvedi o mo╬nostih avtentifikacije pri \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Naslov"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "Identitete"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Izvori po╧te"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Prenos Po╧te"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "OznaХi sporoХilo kot viden [ms]:"
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "NoviХarski stre╬niki"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Viri novic"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organizacija"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Po╧iljaj sporoХila v HTML obliki"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Prosim vpi╧ite svojo PGP/GPG geslo za dostop do kljuХa"
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Geslo ni bilo dano."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP program ni na voljo."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nisem mogel ustvariti cevi: %s"
 
 #: mail/mail-display.c:98
 #, c-format
@@ -5110,65 +3901,65 @@ msgstr "Odpri v %s..."
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "V tej razliХici Evolucije GPG/PGP podpora ni prisotna."
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "╘ifrirano sporoХilo ni prikazano"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "╘ifrirano sporoХilo"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za de╧ifriranje."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, 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:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "NapaХno oblikovano dodatno telo sporoХila."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5231,7 +4022,7 @@ msgstr "Ustvari novo mapo"
 msgid "Register local folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5261,161 +4052,161 @@ msgstr ""
 msgid "Working"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Pobiram po╧to iz %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Poberi po╧to iz %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ni nove po╧te na %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtriram po╧to na zahtevo"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fitriraj po╧to na zahtevo"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Po╧iljam \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Po╧lji to sporoХilo"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Po╧iljam vrsto"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Po╧lji vrsto"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporoХilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Uskljajujem \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "UniХujem \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Prena╧am sporoХilo : %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Prena╧am sporoХilo : %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, 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:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Nalagam mapo %s "
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Nalo╬i mapo %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Kopiram sporoХilo"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Prena╧am sporoХilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5426,7 +4217,7 @@ msgstr "Napak ob shranjevanju datoteke: %s"
 msgid "Cancel"
 msgstr "PrekliХi"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporoХilo!"
 
@@ -5536,116 +4327,192 @@ msgstr "Nova vMapa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Odgovori po╧iljatelju tega sporoХila"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporoХila"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "SporoХilo posreduj naprej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporoХilo"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Zbri╧i to sporХilo"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Neznano"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "OznaХeno"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "priloga"
+
+#: mail/message-list.c:1110
+msgid "From"
+msgstr "Od"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Do datuma"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Sprejeto dne"
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Za"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Velikost"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Prosim vpi╧ite svojo PGP/GPG geslo za dostop do kljuХa"
+
+#: mail/openpgp-utils.c:81
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Prosim vpi╧ite svojo PGP/GPG geslo za dostop do kljuХa"
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "GPG/PGP program ni na voljo."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Geslo ni bilo dano."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nisem mogel ustvariti cevi: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Mape"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "ToХke"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Prika╬i mape, ki se zaХnejo z:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Dobivam shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "NaroХam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Preklicujem naroХnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "NaroХi se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "PrekliХi naroХnono na mapo \"%s\""
@@ -5756,23 +4623,24 @@ msgstr ""
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v va╧i poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoХe pognati."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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"
@@ -5782,7 +4650,7 @@ 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:334
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
@@ -5790,13 +4658,18 @@ msgstr "Pojdi v mapo..."
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Mape"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5804,7 +4677,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5813,15 +4686,15 @@ msgstr ""
 "Opa!  Pogled za `%s' je nepriХakovano umru.  :-(\n"
 "To verjetno pomeni, da se je sesula komponenta %s."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5830,51 +4703,61 @@ msgstr ""
 "Zares ╬elite odstraniti skupino\n"
 "`%s' iz vrstice bli╬njic?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Ka╬i bli╬njice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Ka╬i bli╬njice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Ka╬i vrstico z bli╬njicami"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Ka╬i vrstico z _bli╬njicami"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktiviraj"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Aktiviraj to bli╬njico"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bli╬njico iz vrstice bli╬njic"
 
@@ -5882,12 +4765,11 @@ msgstr "Odstrani to bli╬njico iz vrstice bli╬njic"
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bli╬njic."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_Pogled"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
@@ -6001,1272 +4883,2061 @@ msgstr "IzkljuХeno"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Ustvari nov stik"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "FIXME: _Zmenek"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Zbri╧i stik"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Za_hteva po sestanku"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Poi╧Хi"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Po╧lji sporoХilo"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Poi╧Хi stik"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Stik"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Nov"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Naloga"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Natisni stike"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Zahteva po _nalogi"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Ustavi"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Vpis v dnevniku"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Ustavi nalaganje"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Opomba"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Glej vse"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Izberi izmed..."
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Glej vse stike"
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: V slogu zabele╬ka"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "Nastavitev _Po╧te..."
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: DoloХi _sloge tiskanja"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "_Natisni stike..."
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: Po╧lji"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "_I╧Хi po kontaktih"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Dodaj prilogo..."
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "_Orodja"
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: Prestavi v mapo..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 dni"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopiraj v mapo..."
+
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Nastavitev strani:"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Predogled tiskanja"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "Ca_lendar"
-msgstr "Koledar"
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Prilepi po_sebno..."
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Nastavitve koledarja..."
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "OznaХi kot neprebrano"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Ustvari nov zmenek"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Predmet"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Ustvari nov koledar"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: _Predmet"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dan"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _Neprebran predmet"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Pojdi po Хasu nazaj"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: P_rvi predmet v mapi"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Pojdi po Хasu naprej"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Zadnji predmet v mapi"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Pojdi na"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _ObiХajno"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Pojdi na doloХen datum"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: _Oblikovanje"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Pojdi na sedanjost"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Po meri..."
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Mesec"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "P_rej╧nji"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr "Naprej"
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "_Naslednji"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Odpri koledar"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Orodjarne"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _Datoteka..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: Pr_edmet..."
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Nazaj"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Zadeva..."
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Natisni ta koledar"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Pisava..."
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Odstavek..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Obli_kuj ta obrazec"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: _Oblikuj obrazec..."
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Ob_javi obrazec..."
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: O_bjavi obrazec kot..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Razhro╧Хevalnik skript"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _хrkovanje..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_Obrazci"
+
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "FIXME: _Nov stik"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "FIXME: Nov _stik iz istega podjetja"
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: Novo _pismo za stik"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: Novo _pismo za stik"
+
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: Nov sestanek s stikom"
+
+#: ui/evolution-contact-editor.xml:148
 #, fuzzy
-msgid "Save calendar as something else"
-msgstr "Shrani koledar kot nekaj drugega"
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _хrkovanje..."
+
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: Nova na_loga za stik"
+
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: Nov vpis v _dnevnik za stik"
+
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: _Zastavica za nadaljevanje..."
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: _Poka╬i zemljevid naslova"
+
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: _Odpri spletno stran"
+
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr "FIXME: Posreduj naprej kot _vVizitko"
+
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Posreduj naprej"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Vstavi"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "O_blikuj izpis"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Orodja"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Ka╬i en dan"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "_Dejanja"
+
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "FIXME: Prej╧nji"
+
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Pojdi na prej╧nji predmet"
+
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "FIXME: Naslednji"
+
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Pojdi na naslednji predmet"
+
+#. 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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Poskusno"
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Ka╬i en mesec"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Zaseden"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Ka╬i en teden"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Iz pisarne"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Poka╬i delavni teden"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Ni podatkov"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Povabi ostale..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Mo╬nosti"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Ka╬i le delavne ure"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Ka╬i poman_j╧ano"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Posodobi Prosto/Zasedeno"
+
+#: 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 "_Samodeno izberi"
+
+#: 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 "_Vsi ljudje in vsa sredstva"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Vsi ljudje in eno sredstvo"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Potrebni ljudje"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Potrebni ljudje in eno sredstvo"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "хas priХetka sestanka:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "хas zakljuХka sestanka:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Vsi udele╬eni"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "PTSхPSN"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Sedaj"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Danes"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Teden"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Nova"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "Odpri ko_ledar"
+#: widgets/misc/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "I╧Хi"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "_Natisni ta koledar"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Skupina %i"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save As..."
-msgstr "Shrani _kot..."
+#~ msgid "Delete Contact?"
+#~ msgstr "Zbri╧i stik?"
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Zbri╧i ta predmet"
+#~ msgid "Address _2:"
+#~ msgstr "Naslov _2:"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Check Address"
+#~ msgstr "Preveri naslov"
+
+#~ msgid "Countr_y:"
+#~ msgstr "Dr╬a_va:"
+
+#~ msgid "Finland"
+#~ msgstr "Finska"
+
+#~ msgid "USA"
+#~ msgstr "ZDA"
+
+#~ msgid "_Address:"
+#~ msgstr "_Naslov:"
+
+#~ msgid "_City:"
+#~ msgstr "_Mesto:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "_Po╧tni predal:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "_Dr╬ava/Provinca:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Po╧tna ╧tevilka:"
 
-#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
-msgid "Delete..."
-msgstr "Zbri╧i"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Dodaj izvor"
 
-#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
-msgid "Help"
-msgstr "_PomoХ"
+#~ msgid "URI"
+#~ msgstr "URL"
+
+#~ msgid "Find..."
+#~ msgstr "Poi╧Хi..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "Prejemniki sporoХila"
+
+#~ msgid "Select Names"
+#~ msgstr "Izberi imena"
 
-#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
-msgid "Print En_velope..."
-msgstr "Nas_tavi tiskanje..."
+#~ msgid "Select name from:"
+#~ msgstr "Izberi ime s seznama:"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Natisni ta predmet"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Natisni..."
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Shrani _kot..."
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Shrani in zapri"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Shrani stik in zapri dialog"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "Glej pomoХ na liniji"
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pik Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pik Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Prazni obrazci na koncu:"
+
+#~ msgid "Body"
+#~ msgstr "Telo"
+
+#~ msgid "Bottom:"
+#~ msgstr "Spodaj:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Mere:"
+
+#~ msgid "Font..."
+#~ msgstr "Pisava..."
+
+#~ msgid "Fonts"
+#~ msgstr "Pisave"
+
+#~ msgid "Footer:"
+#~ msgstr "Noga:"
+
+#~ msgid "Format"
+#~ msgstr "Oblika izpisa"
+
+#~ msgid "Header"
+#~ msgstr "Glava"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Glava/noga"
+
+#~ msgid "Headings"
+#~ msgstr "Zaglavja"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Zaglavja za vsako Хrko"
+
+#~ msgid "Height:"
+#~ msgstr "Vi╧ina:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Si sledijo takoj"
+
+#~ msgid "Include:"
+#~ msgstr "VkljuХi:"
+
+#~ msgid "Landscape"
+#~ msgstr "Le╬eХe"
+
+#~ msgid "Left:"
+#~ msgstr "Levo:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Uhlji Хrk ob strani"
+
+#~ msgid "Margins"
+#~ msgstr "Robovi"
+
+#~ msgid "Number of columns:"
+#~ msgstr "╘tevilo stolpcev:"
+
+#~ msgid "Options"
+#~ msgstr "Mo╬nosti"
+
+#~ msgid "Orientation"
+#~ msgstr "Usmerjenost"
+
+#~ msgid "Page"
+#~ msgstr "Stran"
+
+#~ msgid "Paper"
+#~ msgstr "Papir"
+
+#~ msgid "Paper source:"
+#~ msgstr "Izvor papirja:"
+
+#~ msgid "Portrait"
+#~ msgstr "PokonХno"
+
+#~ msgid "Preview:"
+#~ msgstr "Predogled:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Tiskaj z uporabo sivinskega senХenja"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Obratno na sodih straneh"
+
+#~ msgid "Right:"
+#~ msgstr "Desno:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sekcije:"
+
+#~ msgid "Shading"
+#~ msgstr "SenХenje"
+
+#~ msgid "Size:"
+#~ msgstr "Velikost:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ZaХni na novi strani"
+
+#~ msgid "Style name:"
+#~ msgstr "Ime stila:"
+
+#~ msgid "Top:"
+#~ msgstr "Zgoraj:"
+
+#~ msgid "Type:"
+#~ msgstr "Tip:"
+
+#~ msgid "Width:"
+#~ msgstr "╘irina:"
+
+#~ msgid "label26"
+#~ msgstr "oznaХba26"
 
-#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "FIXME: Novo sporoХilo za stik"
+#~ msgid "Calendar Server"
+#~ msgstr "Koledar"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Datoteka"
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Ne morem inicializirati Evolution komponente za povzemanje po╧te."
 
-#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
-msgid "_Print..."
-msgstr "Natisni..."
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolucijin koledarski veznik"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "_Shrani"
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "O tem programu"
+#~ msgid "Edit appointment"
+#~ msgstr "Uredi zmenek"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "O..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "хas podalj╧ka spanja (minut)"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "_Dejanja"
+#~ msgid "05 minutes"
+#~ msgstr "05 minut"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "х_isti"
+#~ msgid "10 minutes"
+#~ msgstr "10 minut"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "_Izre╬i"
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 urna (dop./pop.)"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "PoХisti"
+#~ msgid "15 minutes"
+#~ msgstr "15 minut"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "PoХisti izbiro"
+#~ msgid "24 hour"
+#~ msgstr "24 urna"
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
+#~ msgid "30 minutes"
+#~ msgstr "30 minut"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopiraj"
+#~ msgid "60 minutes"
+#~ msgstr "60 minut"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmi preteХejo po"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Izre╬i"
+#~ msgid "Audio Alarms"
+#~ msgstr "ZvoХni alarmi"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Izre╬i izbrano"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pozvoni, ko se poka╬ejo okna alarmov"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr "Shrani kot XML"
+#~ msgid "Calendar"
+#~ msgstr "Koledar"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabni╧kega vmesnika"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Nastavitve koledarja"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: A_dresar..."
+#~ msgid "Colors"
+#~ msgstr "Barve"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Izberi izmed..."
+#~ msgid "Compress weekends"
+#~ msgstr "SkrХi vikende"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Preve_ri imena"
+#~ msgid "Date navigator options"
+#~ msgstr "Mo╬nosti navigatorja datumov"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopiraj v mapo..."
+#~ msgid "Defaults"
+#~ msgstr "Privzeto"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Oblikuj obrazec..."
+#~ msgid "Display options"
+#~ msgstr "Poka╬i mo╬nosti"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: DoloХi _sloge tiskanja"
+#~ msgid "Enable snoozing for"
+#~ msgstr "OmogoХi podalj╧anje spanja za"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Obli_kuj ta obrazec"
+#~ msgid "End of day:"
+#~ msgstr "Konec dneva:"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rvi predmet v mapi"
+#~ msgid "First day of week:"
+#~ msgstr "Prvi dan tedna:"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Posreduj naprej"
+#~ msgid "Highlight"
+#~ msgstr "Osvetlji:"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Posreduj naprej kot v_Koledar"
+#~ msgid "Items Due Today"
+#~ msgstr "Predmeti z dana╧njim rokom"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: PomoХ"
+#~ msgid "Items Due Today:"
+#~ msgstr "Predmeti z rokom danes:"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Do_konХana naloga"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Predmeti z rokom v prihodnosti"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Vstavi datoteko"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Predmeti z rokom v prihodnosti:"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: Pr_edmet..."
+#~ msgid "Overdue Items"
+#~ msgstr "Predmeti s prekoraХenim rokom"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Prilepi po_sebno..."
+#~ msgid "Overdue Items:"
+#~ msgstr "Predmeti s prekoraХenim rokom:"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Predogled tiskanja"
+#~ msgid "Pick a color"
+#~ msgstr "Izberi barvo"
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: O_bjavi obrazec kot..."
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Opomni me na vse zmenke"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Ob_javi obrazec..."
+#~ msgid "Reminders"
+#~ msgstr "Opozorila"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Ponovitve..."
+#~ msgid "Show"
+#~ msgstr "Ka╬i"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "FIXME: Po╧lji"
+#~ msgid "Show week numbers"
+#~ msgstr "Ka╬i ╧tevilke tednov"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Dodaj prilogo..."
+#~ msgid "Start of day:"
+#~ msgstr "ZaХetek dneva:"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Razhro╧Хevalnik skript"
+#~ msgid "TaskPad"
+#~ msgstr "Naloge"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Zahteva po _nalogi"
+#~ msgid "Time Until Due"
+#~ msgstr "хas do preteka"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Stik"
+#~ msgid "Time divisions:"
+#~ msgstr "хasovne delitve"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Po meri..."
+#~ msgid "Time format:"
+#~ msgstr "Oblika izpisa Хasa"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datoteka..."
+#~ msgid "Visual Alarms"
+#~ msgstr "Vidni alarmi"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Pisava..."
+#~ msgid "Work week"
+#~ msgstr "Delavni teden"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Oblikovanje"
+#~ msgid "minutes before they occur."
+#~ msgstr "minut preden se zgodijo"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Predmet"
+#~ msgid "seconds."
+#~ msgstr "sekundah."
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Vpis v dnevniku"
+#~ msgid "% Comp_lete:"
+#~ msgstr "% konХa_no:"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Zadnji predmet v mapi"
+#~ msgid "C_lassification:"
+#~ msgstr "_Uvrstitev"
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Po╧lji sporoХilo"
+#~ msgid "Date Completed:"
+#~ msgstr "KonХano dne:"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: V slogu zabele╬ka"
+#~ msgid "High"
+#~ msgstr "Visoka"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Prestavi v mapo..."
+#~ msgid "In Progress"
+#~ msgstr "V teku"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nov zmenek"
+#~ msgid "Low"
+#~ msgstr "Nizka"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Opomba"
+#~ msgid "Normal"
+#~ msgstr "ObiХajna"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Zadeva..."
+#~ msgid "Not Started"
+#~ msgstr "Ni priХeto"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Odstavek..."
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Datum _priХetka:"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _хrkovanje..."
+#~ msgid "Task"
+#~ msgstr "Naloga"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "FIXME: _ObiХajno"
+#~ msgid "_Contacts..."
+#~ msgstr "_Stiki..."
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "FIXME: _Naloga"
+#~ msgid "_Due Date:"
+#~ msgstr "_Do datuma:"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Neprebran predmet"
+#~ msgid "_Priority:"
+#~ msgstr "_Prioriteta:"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr "FIXME: kaj pride sem?"
+#~ msgid "_Status:"
+#~ msgstr "_Stanje:"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
+#~ msgid "task-editor-dialog"
+#~ msgstr "dialog-urejevalnik-dogodkov"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Poi╧Хi znova"
+#~ msgid "A_ll day event"
+#~ msgstr "_Celodnevni dogodek"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Poi╧Хi znova"
+#~ msgid "Appointment Basics"
+#~ msgstr "Osnove zmenkov"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
+#~ msgid "Custom recurrence"
+#~ msgstr "Ponovitev po meri"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Pojdi na prej╧nji predmet"
+#~ msgid "Days"
+#~ msgstr "Dni"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
+#~ msgid "Every"
+#~ msgstr "Vsak"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "Napr_ej"
+#~ msgid "Exceptions"
+#~ msgstr "Izjeme"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Prilepi"
+#~ msgid "Hours"
+#~ msgstr "Ur"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Prilepi odlo╬i╧Хe"
+#~ msgid "Mail _to:"
+#~ msgstr "Po╧lji po╧to _za:"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "P_rej╧nji"
+#~ msgid "Minutes"
+#~ msgstr "Minut"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Prej╧nji"
+#~ msgid "Modify"
+#~ msgstr "Spremeni"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Nas_tavi tiskanje..."
+#~ msgid "No recurrence"
+#~ msgstr "Ni ponovitev"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Predogled:"
 
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Lastnosti"
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vatno"
 
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Obnovi"
+#~ msgid "Pu_blic"
+#~ msgstr "_Javno"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
+#~ msgid "Recurrence"
+#~ msgstr "Ponovitev"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Zamenjaj"
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravilo ponovitev"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
+#~ msgid "Reminder"
+#~ msgstr "Opozorilo"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
+#~ msgid "Simple recurrence"
+#~ msgstr "Enostavna ponovitev"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
+#~ msgid "Su_mmary:"
+#~ msgstr "_Povzetek:"
 
-#: ui/evolution-event-editor.xml.h:93
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "FIXME: NaХrtuj sestanek"
+#~ msgid "Time"
+#~ msgstr "хas"
 
-#: ui/evolution-event-editor.xml.h:94
-#, fuzzy
-msgid "Schedule _Meeting"
-msgstr "FIXME: _NaХrtuj sestanek"
+#~ msgid "_Audio"
+#~ msgstr "_Zvok"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr "NaХrtuj nek tip sestanka"
+#~ msgid "_Confidential"
+#~ msgstr "_Zaupno"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "I╧Хi enak niz znova"
+#~ msgid "_End time:"
+#~ msgstr "_хas konca"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "I╧Хi niz"
+#~ msgid "_Mail"
+#~ msgstr "_Po╧lji po╧to"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Izberi vse"
+#~ msgid "_Program"
+#~ msgstr "_Program"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr "Izberi vse"
+#~ msgid "_Run program:"
+#~ msgstr "_Po╬eni program:"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
+#~ msgid "_Start time:"
+#~ msgstr "_хas priХetka:"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "Razveljavi"
+#~ msgid "_Starting date:"
+#~ msgstr "Datum _priХetka:"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
+#~ msgid "day(s)"
+#~ msgstr "dni"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "_O..."
+#~ msgid "event-editor-dialog"
+#~ msgstr "dialog-urejevalec-dogodkov"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "_Zapri"
+#~ msgid "for"
+#~ msgstr "za"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "_Kopiraj"
+#~ msgid "forever"
+#~ msgstr "vseskozi"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr "_Razhro╧Хuj"
+#~ msgid "label21"
+#~ msgstr "oznaХba21"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_Uredi"
+#~ msgid "month(s)"
+#~ msgstr "mesec"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "_Poi╧Хi"
+#~ msgid "until"
+#~ msgstr "do"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_Obrazci"
+#~ msgid "week(s)"
+#~ msgstr "tednov"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "_PomoХ"
+#~ msgid "year(s)"
+#~ msgstr "let"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "Vstavi"
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Nisem mogel ustvariti koledarja v `%s'"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Predmet"
+#, fuzzy
+#~ msgid "April"
+#~ msgstr "april"
 
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "_Prilepi"
+#, fuzzy
+#~ msgid "August"
+#~ msgstr "avgust"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "_Natisni"
+#, fuzzy
+#~ msgid "December"
+#~ msgstr "december"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "_Lastnosti..."
+#, fuzzy
+#~ msgid "February"
+#~ msgstr "februar"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "Obnovi"
+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "Pojdi na datum"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "_Zamenjaj..."
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "Pojdi na danes"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_Orodjarne"
+#, fuzzy
+#~ msgid "January"
+#~ msgstr "januar"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "_Razveljavi"
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "julij"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Sestavi"
+#, fuzzy
+#~ msgid "June"
+#~ msgstr "junij"
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Sestavi novo sporoХilo"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "marec"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Prestavi sporoХilo v novo mapo"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "ponedeljek"
+
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "november"
+
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "oktober"
+
+#, fuzzy
+#~ msgid "September"
+#~ msgstr "september"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "_Mapa"
+#~ msgid "Attachment properties"
+#~ msgstr "Lastnosti priloge"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Filtriraj glede na Po╧iljatelja"
+#~ msgid "File name:"
+#~ msgstr "Ime datoteke:"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Filtriraj glede na Prejemnike"
+#~ msgid "MIME type:"
+#~ msgstr "MIME tip:"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Pozabi _gesla"
+#~ msgid "Edit VFolders"
+#~ msgstr "Uredi vMape"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Poberi po╧to"
+#~ msgid "Filter Rules"
+#~ msgstr "Pravila filtriranja"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Zbri╧i sporХilo"
+#~ msgid "Incoming"
+#~ msgstr ""
+#~ "Prihodna\n"
+#~ "Odhodna\n"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Posredovano sporoХilo %s"
+#~ msgid "Outgoing"
+#~ msgstr "Obroba:"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtualne mape"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "Viri vMap"
+
+#~ msgid "Save"
+#~ msgstr "Shrani"
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Natisni izbrano sporoХilo"
+#~ msgid "Show all hidden"
+#~ msgstr "Ka╬i"
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "Po╧lji _filtre ..."
+#~ msgid "Hide selected"
+#~ msgstr "Zbrisano"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Uredi naroХnine..."
+#~ msgid "Hide read"
+#~ msgstr "Skrij"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "OznaХi _kot prebrano"
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Zbrisano"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "OznaХi kot _neprebrano"
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Zadeva"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Prestavi"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Filter glede na Po╧iljatelja"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Prestavi sporoХilo v novo mapo"
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Uredi sporoХilo"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Predogled sporoХika, ki bo natisnjeno"
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Zadeva je %s"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Predogled tiskanja sporoХila"
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Dobi shrambo za \"%s\""
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Natisni sporoХilo na tiskalniku"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "Povzetek po╧tnega predala"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Natisni sporoХilo..."
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Tip izvora noviХk:"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "Odgovori po╧iljatelju"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Nimate nastavljenih izvorov po╧te"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Izberi vse"
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Ni podatkov"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "Po╧lji po╧to v vrsti in sprejmi novo po╧to"
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Lastnosti priloge"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Ka╬i"
+#~ msgid "Advanced"
+#~ msgstr "Dodaj..."
+
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "Avtentikacija:"
+
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "Avtentikacija:"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Threaded Message list"
-msgstr "_Niten seznam sporoХil"
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "Ne zbri╧i sporoХil s stre╬nika"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "vMapa glede na _Po╧iljatelja"
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Brez"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "vMapa glede na _Sprejemnike"
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-po╧tni naslov:"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "E-po╧tni naslov:"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "_Uveljavi filtre"
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Nastavitev _po╧te"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "_Nastavi mapo"
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "Polno ime:"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Kopiraj v mapo"
+#~ msgid "Hostname:"
+#~ msgstr "Uporabni╧ko ime:"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "_Uredi sporoХilo"
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_UniХi"
+#~ msgid "Identity"
+#~ msgstr "Identiteta"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "Filtriraj glede na _Zadevo"
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "Posreduj _naprej"
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_Po╧lji po╧to"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "_Obrni izbor"
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "vsebuje"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Mail Configuration..."
-msgstr "Nastavitev _Po╧te..."
+#~ msgid "Mail Configuration"
+#~ msgstr "Nastavitev _po╧te"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "_SporoХilo"
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Nastavitev _po╧te"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Prestavi v mapo"
+#~ msgid "News"
+#~ msgstr "Nov"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "_Odpri v novem oknu"
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Mo╬nosti"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "_Natisni sporoХilo"
+#~ msgid "Organization:"
+#~ msgstr "Organizacija:"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Shrani kot..."
+#~ msgid "Password:"
+#~ msgstr "Geslo"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Vir"
+#~ msgid "Reply-to:"
+#~ msgstr "Odgovori-na:"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr "_Niteno"
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "_Potrebni ljudje"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "_Zbri╧i"
+#~ msgid "Save password"
+#~ msgstr "Shrani kot vVizitko"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "vMapa glede na _Zadevo"
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Datoteka s podpisom:"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Urejevalnik _virtualnih map..."
+#~ msgid "Sending Email"
+#~ msgstr "Program sendmail"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Prilo╬i"
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "Nastavitev _po╧te"
 
-#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "Close the current file"
-msgstr "Shrani trenutno datoteko"
+#~ msgid "Server Type: "
+#~ msgstr "Stre╬nik:"
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "╘ifrirano sporoХilo"
+#~ msgid "Servers"
+#~ msgstr "Stre╬nik:"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Signature file:"
+#~ msgstr "Datoteka s podpisom:"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Vstavi datoteko v sporoХilo kot besedilo"
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Datoteka s podpisom:"
+
+#~ msgid "Sources"
+#~ msgstr "Viri"
 
-#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-msgid "Insert text file..."
-msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+#~ msgid "Type"
+#~ msgstr "Tip:"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "Odpri datoteko"
+#~ msgid "User Information"
+#~ msgstr "Ni podatkov"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "Uporabni╧ko ime:"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "minute(s)"
+#~ msgstr "minut"
+
+#~ 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 ""
+#~ "Vnesite svoje ime in e-po╧tni naslov, ki naj se uporablja v izhodni po╧ti Po "
+#~ "╬elji lahko vnesete tudi ime va╧e organizacije in ime datoteke iz katere naj "
+#~ "se prebere va╧ podpis."
+
+#~ msgid "Full name:"
+#~ msgstr "Polno ime:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-po╧tni naslov:"
+
+#~ msgid "Signature File"
+#~ msgstr "Datoteka s podpisom"
+
+#~ msgid "Server:"
+#~ msgstr "Stre╬nik:"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Ugotovi podprte tipe..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Ne zbri╧i sporoХil s stre╬nika"
+
+#~ msgid "Test Settings"
+#~ msgstr "Preveri nastavitve"
+
+#~ msgid "Mail source type:"
+#~ msgstr "Tip izvora po╧te:"
+
+#~ 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 ""
+#~ "Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
+#~ "potrebne podatke.\n"
+#~ "\n"
+#~ "хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+#~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
+
+#~ msgid "News source type:"
+#~ msgstr "Tip izvora noviХk:"
+
+#~ 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 ""
+#~ "Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
+#~ "potrebne podatke.\n"
+#~ "\n"
+#~ "хe stre╬nik potrebuje avtentikacijo, lako kliknete na gumb \"Ugotovi podprte "
+#~ "tipe...\", po tem ko boste vnesli ostale podatke."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Tip prenosa po╧te:"
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "Shrani _kot"
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
+#~ "potrebne podatke.\n"
+#~ "\n"
+#~ "хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+#~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
+
+#~ msgid "Add Identity"
+#~ msgstr "Dodaj identiteto"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Uredi identiteto"
+
+#~ msgid "Add Source"
+#~ msgstr "Dodaj izvor"
+
+#~ msgid "Edit Source"
+#~ msgstr "Uredi izbor"
+
+#~ msgid "Add News Server"
+#~ msgstr "Dodaj noviХarski stre╬nik"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Uredi noviХarski stre╬nik"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Preizku╧am \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Povezava je bila uspe╧na!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Poizvedujem o mo╬nostih avtentifikacije pri \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Poizvedi o mo╬nostih avtentifikacije pri \"%s\""
+
+#~ msgid "Address"
+#~ msgstr "Naslov"
+
+#~ msgid "Identities"
+#~ msgstr "Identitete"
+
+#~ msgid "Mail Sources"
+#~ msgstr "Izvori po╧te"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Prenos Po╧te"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "OznaХi sporoХilo kot viden [ms]:"
+
+#~ msgid "News Servers"
+#~ msgstr "NoviХarski stre╬niki"
+
+#~ msgid "News Sources"
+#~ msgstr "Viri novic"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Po╧iljaj sporoХila v HTML obliki"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "V tej razliХici Evolucije GPG/PGP podpora ni prisotna."
+
+#~ msgid "Delete a contact"
+#~ msgstr "Zbri╧i stik"
+
+#~ msgid "Find"
+#~ msgstr "Poi╧Хi"
+
+#~ msgid "Find a contact"
+#~ msgstr "Poi╧Хi stik"
+
+#~ msgid "Print contacts"
+#~ msgstr "Natisni stike"
+
+#~ msgid "Stop"
+#~ msgstr "Ustavi"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Ustavi nalaganje"
+
+#~ msgid "View All"
+#~ msgstr "Glej vse"
+
+#~ msgid "View all contacts"
+#~ msgstr "Glej vse stike"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Shrani v _mapo..."
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Nastavitev _Po╧te..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Natisni stike..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_I╧Хi po kontaktih"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alternativne nastavitve"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "Shrani v _mapo..."
+#~ msgid "Ca_lendar"
+#~ msgstr "Koledar"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Nastavitve koledarja..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Ustvari nov zmenek"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Ustvari nov koledar"
+
+#~ msgid "Day"
+#~ msgstr "Dan"
+
+#~ msgid "Go back in time"
+#~ msgstr "Pojdi po Хasu nazaj"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Pojdi po Хasu naprej"
+
+#~ msgid "Go to"
+#~ msgstr "Pojdi na"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Pojdi na doloХen datum"
+
+#~ msgid "Go to present time"
+#~ msgstr "Pojdi na sedanjost"
+
+#~ msgid "Month"
+#~ msgstr "Mesec"
+
+#~ msgid "Next"
+#~ msgstr "Naprej"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Prev"
+#~ msgstr "Nazaj"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Natisni ta koledar"
 
-#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-msgid "Save the current file with a different name"
-msgstr "Shrani trenutno datoteko"
+#~ msgid "Save calendar as something else"
+#~ msgstr "Shrani koledar kot nekaj drugega"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Ka╬i en dan"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Ka╬i en mesec"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Ka╬i en teden"
+
+#~ msgid "Show the working week"
+#~ msgstr "Poka╬i delavni teden"
+
+#~ msgid "Week"
+#~ msgstr "Teden"
+
+#~ msgid "_New"
+#~ msgstr "_Nova"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Odpri ko_ledar"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Shrani sporoХilo v izbrano mapo"
+#~ msgid "_Print this calendar"
+#~ msgstr "_Natisni ta koledar"
 
-#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-msgid "Send"
-msgstr "Po╧iljatelj"
+#~ msgid "_Save As..."
+#~ msgstr "Shrani _kot..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Zbri╧i ta predmet"
 
-#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-msgid "Send _Later"
-msgstr "Po╧iljatelj"
+#~ msgid "Delete..."
+#~ msgstr "Zbri╧i"
 
-#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-msgid "Send _later"
-msgstr "Po╧iljatelj"
+#~ msgid "Help"
+#~ msgstr "_PomoХ"
+
+#, fuzzy
+#~ msgid "Print En_velope..."
+#~ msgstr "Nas_tavi tiskanje..."
+
+#~ msgid "Print this item"
+#~ msgstr "Natisni ta predmet"
+
+#~ msgid "Print..."
+#~ msgstr "Natisni..."
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "Po╧lji po╧to v HTML obliki"
+#~ msgid "Save _As..."
+#~ msgstr "Shrani _kot..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Shrani in zapri"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Shrani stik in zapri dialog"
+
+#~ msgid "See online help"
+#~ msgstr "Glej pomoХ na liniji"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Po╧lji to sporoХilo"
+#~ msgid "Send _message to contact..."
+#~ msgstr "FIXME: Novo sporoХilo za stik"
+
+#~ msgid "_File"
+#~ msgstr "_Datoteka"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Po╧lji to sporoХilo"
+#~ msgid "_Print..."
+#~ msgstr "Natisni..."
+
+#~ msgid "_Save"
+#~ msgstr "_Shrani"
+
+#~ msgid "About this application"
+#~ msgstr "O tem programu"
+
+#~ msgid "About..."
+#~ msgstr "O..."
+
+#~ msgid "C_lear"
+#~ msgstr "х_isti"
+
+#~ msgid "C_ut"
+#~ msgstr "_Izre╬i"
+
+#~ msgid "Clear"
+#~ msgstr "PoХisti"
+
+#~ msgid "Clear the selection"
+#~ msgstr "PoХisti izbiro"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Zapri ta zmenek"
+
+#~ msgid "Copy"
+#~ msgstr "Kopiraj"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiraj izbrano"
+
+#~ msgid "Cut"
+#~ msgstr "Izre╬i"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Izre╬i izbrano"
+
+#~ msgid "Dump XML"
+#~ msgstr "Shrani kot XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Shranio Xml opis uporabni╧kega vmesnika"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: A_dresar..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Preve_ri imena"
+
+#~ msgid "FIXME: Forward as v_Calendar"
+#~ msgstr "FIXME: Posreduj naprej kot v_Koledar"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: PomoХ"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Do_konХana naloga"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Vstavi datoteko"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Ponovitve..."
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Nov zmenek"
+
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "FIXME: kaj pride sem?"
+
+#~ msgid "Find Again"
+#~ msgstr "Poi╧Хi znova"
+
+#~ msgid "Find _Again"
+#~ msgstr "Poi╧Хi znova"
+
+#~ msgid "Modify the file's properties"
+#~ msgstr "Spremeni lastnosti datoteke"
+
+#~ msgid "N_ext"
+#~ msgstr "Napr_ej"
+
+#~ msgid "Paste"
+#~ msgstr "Prilepi"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Prilepi odlo╬i╧Хe"
+
+#~ msgid "Previous"
+#~ msgstr "Prej╧nji"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Nas_tavi tiskanje..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Nastavitev tiskanja"
+
+#~ msgid "Properties"
+#~ msgstr "Lastnosti"
+
+#~ msgid "Redo"
+#~ msgstr "Obnovi"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Obnovi razveljavljeno dejanje"
+
+#~ msgid "Replace"
+#~ msgstr "Zamenjaj"
+
+#~ msgid "Replace a string"
+#~ msgstr "Zamenjaj niz"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Shrani zmenek in zapri dialog"
+
+#~ msgid "Save the current file"
+#~ msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Po╧lji to sporoХilo"
+#~ msgid "Schedule Meeting"
+#~ msgstr "FIXME: NaХrtuj sestanek"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Ka╬i/skrij priloge"
+#~ msgid "Schedule _Meeting"
+#~ msgstr "FIXME: _NaХrtuj sestanek"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Ka╬i priloge"
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "NaХrtuj nek tip sestanka"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "I╧Хi enak niz znova"
+
+#~ msgid "Search for a string"
+#~ msgstr "I╧Хi niz"
+
+#~ msgid "Select All"
+#~ msgstr "Izberi vse"
+
+#~ msgid "Select everything"
+#~ msgstr "Izberi vse"
+
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
+
+#~ msgid "Undo"
+#~ msgstr "Razveljavi"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Razveljavi zadnje dejanje"
+
+#~ msgid "_About..."
+#~ msgstr "_O..."
+
+#~ msgid "_Close"
+#~ msgstr "_Zapri"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopiraj"
+
+#~ msgid "_Debug"
+#~ msgstr "_Razhro╧Хuj"
+
+#~ msgid "_Edit"
+#~ msgstr "_Uredi"
+
+#~ msgid "_Find..."
+#~ msgstr "_Poi╧Хi"
+
+#~ msgid "_Help"
+#~ msgstr "_PomoХ"
+
+#~ msgid "_Paste"
+#~ msgstr "_Prilepi"
+
+#~ msgid "_Print"
+#~ msgstr "_Natisni"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Lastnosti..."
+
+#~ msgid "_Redo"
+#~ msgstr "Obnovi"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Zamenjaj..."
+
+#~ msgid "_Undo"
+#~ msgstr "_Razveljavi"
+
+#~ msgid "Compose"
+#~ msgstr "Sestavi"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Sestavi novo sporoХilo"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Prestavi sporoХilo v novo mapo"
+
+#~ msgid "F_older"
+#~ msgstr "_Mapa"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filtriraj glede na Po╧iljatelja"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtriraj glede na Prejemnike"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Pozabi _gesla"
+
+#~ msgid "Get Mail"
+#~ msgstr "Poberi po╧to"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "Ka╬i priloge"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Zbri╧i sporХilo"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Po╧iljam sporoХilo brez navedene zadeve"
+#~ msgid "Hide _Read messages"
+#~ msgstr "Posredovano sporoХilo %s"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Natisni izbrano sporoХilo"
 
-#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
-msgid "_Open..."
-msgstr "Odpri..."
+#~ msgid "Mail _Filters..."
+#~ msgstr "Po╧lji _filtre ..."
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Uredi naroХnine..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr "Dodaj mapo na seznam naroХenih map"
+#~ msgid "Mar_k As Read"
+#~ msgstr "OznaХi _kot prebrano"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Osve╬i seznam"
+#~ msgid "Mark As U_nread"
+#~ msgstr "OznaХi kot _neprebrano"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Osve╬i seznam map"
+#~ msgid "Move"
+#~ msgstr "Prestavi"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrani mapo iz seznama naroХenih map"
+#~ msgid "Move message to a new folder"
+#~ msgstr "Prestavi sporoХilo v novo mapo"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr "NaroХi"
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Predogled sporoХika, ki bo natisnjeno"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr "Prekini naroХnino"
+#~ msgid "Print Preview of message..."
+#~ msgstr "Predogled tiskanja sporoХila"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "Poka╬i drugo mapo"
+#~ msgid "Print message to the printer"
+#~ msgstr "Natisni sporoХilo na tiskalniku"
+
+#~ msgid "Print message..."
+#~ msgstr "Natisni sporoХilo..."
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "_Izhod"
+#~ msgid "Reply to _All"
+#~ msgstr "Odgovori _vsem"
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution vrstica z bli╬njicami"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Odgovori po╧iljatelju"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Izhod iz programa"
+#~ msgid "Select _All"
+#~ msgstr "Izberi vse"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Kako _zaХeti"
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Po╧lji po╧to v vrsti in sprejmi novo po╧to"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Ka╬i podatke o Evoluciji"
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Ka╬i"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Ka╬i vrstico z _mapami"
+#~ msgid "Threaded Message list"
+#~ msgstr "_Niten seznam sporoХil"
 
-#: ui/evolution.xml.h:13
-msgid "Show the _Shortcut Bar"
-msgstr "Ka╬i vrstico z bli╬njicami"
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "vMapa glede na _Po╧iljatelja"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "vMapa glede na _Sprejemnike"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Uveljavi filtre"
 
-#: ui/evolution.xml.h:14
 #, fuzzy
-msgid "Submit _Bug Report"
-msgstr "_Po╧lji poroХilo o hro╧Хu"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopiraj v mapo"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Uredi sporoХilo"
+
+#~ msgid "_Expunge"
+#~ msgstr "_UniХi"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "Filtriraj glede na _Zadevo"
+
+#~ msgid "_Forward"
+#~ msgstr "Posreduj _naprej"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Obrni izbor"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Nastavitev _Po╧te..."
+
+#~ msgid "_Message"
+#~ msgstr "_SporoХilo"
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "Po╧lji poroХilo o hro╧Хu z uporabo progama Bug buddy"
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Prestavi v mapo"
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Preklopi prikaz vrstice z mapami"
+#~ msgid "_Open in New Window"
+#~ msgstr "_Odpri v novem oknu"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Preklopi prikaz vrstice z bli╬njicami"
+#~ msgid "_Print Message"
+#~ msgstr "_Natisni sporoХilo"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr "Uporaba upravljalnika _stikov"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Shrani kot..."
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Uporaba _koledarja"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Vir"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Uporaba _po╧te"
+#~ msgid "_Threaded"
+#~ msgstr "_Niteno"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_O Evoluciji..."
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "_Zbri╧i"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "_Zmenek (FIXME)"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "vMapa glede na _Zadevo"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Mapa"
+#~ msgid "Attach"
+#~ msgstr "Prilo╬i"
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "Pojdi v _mapo..."
+#, fuzzy
+#~ msgid "Close the current file"
+#~ msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "_Kazalo"
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "╘ifrirano sporoХilo"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "_Po╧lji sporoХilo (FIXME)"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "_Nastavitve"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Vstavi datoteko v sporoХilo kot besedilo"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_Naloga (FIXME)"
+#, fuzzy
+#~ msgid "Insert text file..."
+#~ msgstr "_Vstavi datoteko z besedilom... (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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "Odpri datoteko"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Poskusno"
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Shrani _kot"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Zaseden"
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Shrani v _mapo..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Iz pisarne"
+#, fuzzy
+#~ msgid "Save in folder..."
+#~ msgstr "Shrani v _mapo..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ni podatkov"
+#, fuzzy
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Shrani trenutno datoteko"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Povabi ostale..."
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Shrani sporoХilo v izbrano mapo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Mo╬nosti"
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "Po╧iljatelj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Ka╬i le delavne ure"
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Po╧iljatelj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Ka╬i poman_j╧ano"
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Po╧iljatelj"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Posodobi Prosto/Zasedeno"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Po╧lji po╧to v HTML obliki"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Po╧lji to sporoХilo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Samodeno izberi"
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Po╧lji to sporoХilo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Po╧lji to sporoХilo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Vsi ljudje in vsa sredstva"
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Ka╬i/skrij priloge"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Vsi ljudje in eno sredstvo"
+#~ msgid "Show _attachments"
+#~ msgstr "Ka╬i priloge"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Potrebni ljudje"
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Po╧iljam sporoХilo brez navedene zadeve"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Potrebni ljudje in eno sredstvo"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "хas priХetka sestanka:"
+#, fuzzy
+#~ msgid "_Open..."
+#~ msgstr "Odpri..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "хas zakljuХka sestanka:"
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Dodaj mapo na seznam naroХenih map"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Vsi udele╬eni"
+#~ msgid "Refresh List"
+#~ msgstr "Osve╬i seznam"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "PTSхPSN"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Osve╬i seznam map"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Odstrani mapo iz seznama naroХenih map"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Subscribe"
+#~ msgstr "NaroХi"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Sedaj"
+#~ msgid "Unsubscribe"
+#~ msgstr "Prekini naroХnino"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Display a different folder"
+#~ msgstr "Poka╬i drugo mapo"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "E_xit"
+#~ msgstr "_Izhod"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Skupina %i"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution vrstica z bli╬njicami"
+
+#~ msgid "Exit the program"
+#~ msgstr "Izhod iz programa"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kako _zaХeti"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Ka╬i podatke o Evoluciji"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Ka╬i vrstico z _mapami"
+
+#, fuzzy
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Po╧lji poroХilo o hro╧Хu"
+
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Po╧lji poroХilo o hro╧Хu z uporabo progama Bug buddy"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Preklopi prikaz vrstice z mapami"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Preklopi prikaz vrstice z bli╬njicami"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uporaba upravljalnika _stikov"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uporaba _koledarja"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uporaba _po╧te"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_O Evoluciji..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Zmenek (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Mapa"
 
-#~ msgid "categories"
-#~ msgstr "kategorije"
+#~ msgid "_Go to Folder..."
+#~ msgstr "Pojdi v _mapo..."
+
+#~ msgid "_Index"
+#~ msgstr "_Kazalo"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "_Po╧lji sporoХilo (FIXME)"
+
+#~ msgid "_Settings"
+#~ msgstr "_Nastavitve"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Naloga (FIXME)"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Predmet(i) pripada(jo) tem kategorijam:"
@@ -7649,9 +7320,6 @@ msgstr "Skupina %i"
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmi"
-
 #~ msgid "Alarm Properties"
 #~ msgstr "Lastnosti alarma"
 
@@ -7673,13 +7341,6 @@ msgstr "Skupina %i"
 #~ 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"
 
@@ -7704,9 +7365,6 @@ msgstr "Skupina %i"
 #~ msgid "Draft"
 #~ msgstr "Osnutek"
 
-#~ msgid "Flagged"
-#~ msgstr "OznaХeno"
-
 #~ msgid "Set Flag"
 #~ msgstr "Postavi oznaХbo"
 
@@ -7784,54 +7442,9 @@ msgstr "Skupina %i"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Neveljaven URL shrambe (ni stre╬nika): %s"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Zmenek"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "FIXME: Za_hteva po sestanku"
-
-#~ msgid "Ne_xt"
-#~ msgstr "_Naslednji"
-
-#~ msgid "FIXME: _New Contact"
-#~ msgstr "FIXME: _Nov stik"
-
-#~ msgid "FIXME: New _Contact from Same Company"
-#~ msgstr "FIXME: Nov _stik iz istega podjetja"
-
-#~ msgid "FIXME: New _Letter to Contact"
-#~ msgstr "FIXME: Novo _pismo za stik"
-
-#~ msgid "FIXME: New Meetin_g with Contact"
-#~ msgstr "FIXME: Nov sestanek s stikom"
-
-#~ msgid "FIXME: New _Task for Contact"
-#~ msgstr "FIXME: Nova na_loga za stik"
-
-#~ msgid "FIXME: New _Journal Entry for Contact"
-#~ msgstr "FIXME: Nov vpis v _dnevnik za stik"
-
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Zastavica za nadaljevanje..."
-
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "FIXME: _Poka╬i zemljevid naslova"
-
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: _Odpri spletno stran"
-
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "FIXME: Posreduj naprej kot _vVizitko"
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Vstavi datoteko kot prilogo"
 
-#~ msgid "FIXME: Previous"
-#~ msgstr "FIXME: Prej╧nji"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "FIXME: Naslednji"
-
 #~ msgid "* Click here to add a contact *"
 #~ msgstr "* Kliknite tu za dodajo stika *"
 
@@ -7933,15 +7546,6 @@ msgstr "Skupina %i"
 #~ msgid "Resources:"
 #~ msgstr "Viri:"
 
-#~ msgid "Start Date"
-#~ msgstr "Datum priХetka"
-
-#~ msgid "End Date"
-#~ msgstr "Datum konca"
-
-#~ msgid "Geographical Position"
-#~ msgstr "Zemljepisna lega"
-
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -8137,18 +7741,6 @@ msgstr "Skupina %i"
 #~ msgid "Waiting for user to enter data"
 #~ msgstr "хakam na uporabnika, da vpi╧e podatek"
 
-#~ msgid "From"
-#~ msgstr "Od"
-
-#~ msgid "To"
-#~ msgstr "Za"
-
-#~ msgid "Size"
-#~ msgstr "Velikost"
-
-#~ msgid "Show _shortcut bar"
-#~ msgstr "Ka╬i vrstico z _bli╬njicami"
-
 #~ msgid "Show _folder bar"
 #~ msgstr "Ka╬i vrstico z _mapami"
 
diff --git a/po/sv.po b/po/sv.po
index de0b167ddc..9837e91462 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,13 +5,13 @@
 # Christian Rose <menthos@menthos.com>, 2000.
 # Martin NorbДck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.58 2001/01/17 16:38:36 mback Exp $
+# $Id: sv.po,v 1.59 2001/01/18 05:11:01 campd Exp $
 #
 #: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-17 17:37+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\n"
 "PO-Revision-Date: 2001-01-03 23:43+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,26 +19,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "LДgg till tjДnst"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "LДgg till ny tjДnst till sammanfattningen"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Skriv ett nytt e-brev"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "InstДllningar fЖr sammanfattningen..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Ny post"
-
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan inte initiera Evolutions sammanfattningskomponent."
@@ -190,16 +170,15 @@ msgstr ""
 msgid "Error"
 msgstr "Fel"
 
-#: mail/mail-config.c:750
+#: mail/mail-config.c:799
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
-#: mail/mail-config.c:752
+#: mail/mail-config.c:801
 msgid "Connect to server"
 msgstr "Anslut till server"
 
-#: notes/component-factory.c:27 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:14 ui/evolution-tasks.xml.h:3
+#: notes/component-factory.c:27
 msgid "New"
 msgstr "Ny"
 
@@ -215,580 +194,6 @@ msgstr "Kan inte initiera Evolutions anteckningspostkomponent."
 msgid "Notes Component: Could not initialize bonobo"
 msgstr "Anteckningskomponent: Kunde inte initiera Bonobo"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om detta program"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_еtgДrder"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "C_lear"
-msgstr "_TЖm"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
-msgid "C_ut"
-msgstr "Klipp _ut"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
-msgid "Clear"
-msgstr "TЖm"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
-msgid "Clear the selection"
-msgstr "TЖm markeringen"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8
-msgid "Close"
-msgstr "StДng"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
-msgid "Close the current file"
-msgstr "StДng aktuell fil"
-
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
-msgid "Copy"
-msgstr "Kopiera"
-
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
-msgid "Copy the selection"
-msgstr "Koiera markeringen"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cut the selection"
-msgstr "Klipp ut markeringen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:403
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:673
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ui/evolution-task-editor-dialog.xml.h:15
-msgid "Delete this task"
-msgstr "Ta bort denna uppgift"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Dump XML"
-msgstr "Kasta XML"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Kasta anvДndargrДnssnittsbeskrivningen i XML"
-
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: Adress_bok..."
-
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: _Tilldela uppgift"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: V_Дlj formulДr..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: _Kontrollera namn"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopier_a till mapp..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Ut_forma ett formulДr..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Ange utskrifts_stiler"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: _Utforma detta formulДr"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: FЖ_rsta objektet i mappen"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Vidarebefordra"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "FIXME: HjДlp"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Oav_slutad uppgift"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "FIXME: Infoga fil"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "FIXME: Obj_ekt..."
-
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: _MЖtesbegДran"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Klistra in _special... "
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: FЖrhands_granska"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicera formulДr som..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicera _formulДr..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Upprepning..."
-
-#: ui/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Svara till alla"
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "FIXME: S_kicka"
-
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: S_kicka statusrapport"
-
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Skippa fЖrekomst"
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Spara bilagor..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Skri_ptfelsЖkare"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Uppgifts_begДran"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: _Appointment"
-msgstr "FIXME: MЖte"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Kontakt"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Anpassa..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Fil..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Typsnitt..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Formatering"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: Objek_t"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Dagbokspost"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Sista objektet i mappen"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Posta meddelande"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: Markera som fДrdig"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Minneslappsstil"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Flytta till mapp..."
-
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _New Task"
-msgstr "FIXME: Ny Uppgift"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objekt..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: St_ycke..."
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Reply"
-msgstr "FIXME: Svara"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Stavning..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Standard"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "FIXME: _Uppgift"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _OlДst objekt"
-
-#: ui/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _note"
-msgstr "FIXME: _anteckning"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "FIXME: vad ska vi stoppa hДr?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "Find"
-msgstr "SЖk"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "SЖk igen"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "SЖk ige_n..."
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
-msgid "Go to the next item"
-msgstr "GЕ till nДsta objekt"
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
-msgid "Go to the previous item"
-msgstr "GЕ till fЖregЕende objekt"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
-msgid "Modify the file's properties"
-msgstr "дndra filens egenskaper"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
-msgid "N_ext"
-msgstr "N_Дsta"
-
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
-msgid "Next"
-msgstr "NДsta"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
-msgid "Paste"
-msgstr "Klistra in"
-
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Klistra in frЕn urklipp"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
-msgid "Pre_vious"
-msgstr "FЖre_gЕende"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
-msgid "Previous"
-msgstr "FЖregЕende"
-
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
-msgid "Print S_etup..."
-msgstr "Skrivar_instДllning..."
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
-msgid "Print Setup"
-msgstr "SkrivarinstДllningar"
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "Print this item"
-msgstr "Skriv ut detta objekt"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "Print..."
-msgstr "Skriv ut..."
-
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: ui/evolution-event-editor.xml.h:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "GЖr om"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "GЖr om den Еngrade ЕtgДrden"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "ErsДtt"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "ErsДtt en strДng"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
-msgid "Save"
-msgstr "Spara"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
-msgid "Save _As..."
-msgstr "Spara so_m..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
-msgid "Save and Close"
-msgstr "Spara och stДng"
-
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
-msgid "Save the current file"
-msgstr "Spara aktuell fil"
-
-#: ui/evolution-task-editor-dialog.xml.h:94
-msgid "Save the task and close the dialog box"
-msgstr "Spara uppgiften och stДng dialogrutan"
-
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "SЖk igen efter samma strДng"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "SЖk efter en strДng"
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
-msgid "See online help"
-msgstr "Se online-hjДlpen"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
-msgid "Select All"
-msgstr "Markera allt"
-
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
-msgid "Select everything"
-msgstr "Markera alltihop"
-
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
-msgid "Setup the page settings for your current printer"
-msgstr "StДll in sidinstДllningarna fЖr din aktuella skrivare"
-
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "еngra"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "еngra den senaste ЕtgДrden"
-
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
-msgid "_About..."
-msgstr "_Om..."
-
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104
-msgid "_Close"
-msgstr "S_tДng"
-
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
-msgid "_Debug"
-msgstr "Fels_Жk"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
-msgid "_Delete"
-msgstr "_Ta bort"
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:27
-msgid "_Edit"
-msgstr "R_edigera"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:109 ui/evolution.xml.h:28
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ui/evolution-event-editor.xml.h:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_SЖk..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "_FormulДr"
-
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:31
-msgid "_Help"
-msgstr "_HjДlp"
-
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "_Infoga"
-
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objekt"
-
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
-msgid "_Paste"
-msgstr "Klistra _in"
-
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Skriv _ut"
-
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
-msgid "_Properties..."
-msgstr "_Egenskaper..."
-
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "_GЖr om"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "_ErsДtt..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
-msgid "_Save"
-msgstr "_Spara"
-
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "_Verktygsrader"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
-msgid "_Tools"
-msgstr "_Verktyg"
-
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_еngra"
-
-#: shell/e-storage-set-view.c:338 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:124 ui/evolution.xml.h:38
-msgid "_View"
-msgstr "_Visa"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "дndra instДllningar"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Skapa en ny uppgift"
-
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Skriv ut"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Spara uppgift som nЕgot annat"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "InstДllningar fЖr uppgifter..."
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Spara som..."
-
 #: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Kort: "
@@ -1219,10 +624,6 @@ msgstr "Kunde inte starta wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte lДsa pilotens adressprogramblock"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Ta bort kontakten?"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1232,6 +633,11 @@ msgstr "Ta bort kontakten?"
 msgid "_Add"
 msgstr "_LДgg till"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: ui/evolution-contact-editor.xml:37
+msgid "_Delete"
+msgstr "_Ta bort"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Telefontyper"
@@ -1242,9 +648,6 @@ msgid "New phone type"
 msgstr "Ny telefontyp"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
 msgid "Add"
 msgstr "LДgg till"
 
@@ -1302,8 +705,6 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -1320,7 +721,6 @@ msgid "_Address..."
 msgstr "_Adress..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
 msgid "General"
 msgstr "AllmДnt"
 
@@ -1365,7 +765,6 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1471,50 +870,6 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adress _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
-msgstr "Kontrollera adress"
-
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
-msgstr "_Land:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
-msgstr "Finland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
-msgstr "_Adress:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
-msgstr "_Ort:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
-msgstr "_Box:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
-msgstr "Del_stat/Provins:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Postnummer:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1583,7 +938,6 @@ msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
@@ -1701,7 +1055,6 @@ msgid "Remember this password"
 msgstr "Kom ihЕg detta lЖsenord"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config.glade.h:27
 msgid "Host:"
 msgstr "VДrd:"
 
@@ -1718,12 +1071,10 @@ msgid "Search Scope:"
 msgstr "SЖkomfattning:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config.glade.h:9
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config.glade.h:46
 msgid "Path:"
 msgstr "SЖkvДg:"
 
@@ -1748,168 +1099,27 @@ msgstr ""
 "den."
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:39
 msgid "Name:"
 msgstr "Namn:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "AdressbokskДllor"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:659
-#: mail/mail-config.glade.h:22
-msgid "Edit"
-msgstr "Redigera"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Namn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "SЖk..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Mottagare"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Markera namn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "VДlj namn frЕn:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "SЖk"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+msgid "Name"
+msgstr "Namn"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:566
 msgid "Email"
 msgstr "E-post"
@@ -1976,174 +1186,6 @@ msgstr ""
 "\n"
 "Dubbelklicka hДr fЖr att skapa en ny kontakt."
 
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Tomma blanketter vid slutet:"
-
-#: addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Meddelandetext"
-
-#: addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Underst:"
-
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Typsnitt..."
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Typsnitt"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Sidfot:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Header"
-msgstr "Rubrik"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Rubrik/sidfot"
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Rubriker"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Rubriker fЖr varje brev"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "HЖjd:"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "FЖlj omedelbart efter varandra"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Inkludera:"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Liggande"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "VДnster:"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Brevflikar pЕ sidan"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marginaler"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Antal kolumner:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Alternativ"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientering"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Sida"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "SidinstДllningar:"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papper"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "PapperskДlla:"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "StЕende"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "FЖrhandsgranska:"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Skriv ut med grЕ skuggning"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "VДnd jДmna sidor"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "HЖger:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sektioner:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Skuggning"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Size:"
-msgstr "Storlek:"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "BЖrja pЕ en ny sida"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Stil:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "жverst:"
-
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:67
-msgid "Type:"
-msgstr "Typ:"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Bredd:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolutions kalenderkanal"
@@ -2180,7 +1222,7 @@ msgstr "Kunde inte lДsa pilotens att-gЖra-programblock"
 msgid "Reminder of your appointment at "
 msgstr "PЕminnelse om ditt mЖte den "
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Slumra"
 
@@ -2229,17 +1271,14 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
 #: calendar/gui/calendar-model.c:374
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "Public"
 msgstr "Publikt"
 
 #: calendar/gui/calendar-model.c:377
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:380
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -2377,263 +1416,6 @@ msgstr "Avisering om ditt mЖte pЕ %A %d %b %Y %H.%M"
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgДnglig."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Redigera mЖte"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Slumringstid (minuter)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "05 minutes"
-msgstr "05 minuter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "10 minutes"
-msgstr "10 minuter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timmar (fm/em)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timmar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "30 minutes"
-msgstr "30 minuter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "60 minutes"
-msgstr "60 minuter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Ljudalarm stДngs av efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Ljudalarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr "Pip nДr alarmfЖnster visas."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "KalenderinstДllningar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "FДrger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Tryck ihop helger"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativ fЖr datumnavigerare"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "StandardvДrden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Visningsalternativ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "FЖrfallodatum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Aktivera slummer i"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
-msgstr "Dagen slutar:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr "FЖrsta dagen i veckan:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markera"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "objekt som ska ha utfЖrts idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Objekt som ska ha utfЖrts idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "objekt som inte ska utfЖras Дn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Obejkt som inte ska utfЖras Дn:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "mЕn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "mЕndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "objekt som skulle ha utfЖrts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Objekt som skulle ha utfЖrts:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "VДlj en fДrg"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "PЕminn mig om alla mЖten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "PЕminnare"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "lЖr"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "lЖrdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Visa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Visa sluttiderna pЕ mЖten"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
-msgstr "Visa veckonummer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
-msgstr "Dagen startar:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "sЖn"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "sЖndag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Uppgiftsyta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "torsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid till fЖrfallodatum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
-msgstr "Tidsdivisioner:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
-msgstr "Tidsformat:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "tisdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuella alarm"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "ons"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbetsvecka"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
-msgstr "minuter innan de sker."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "seconds."
-msgstr "sekunder."
-
 #: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2661,96 +1443,6 @@ msgstr "дr du sДker pЕ att du vill ta bort dagboksposten \"%s\"?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "дr du sДker pЕ att du vill ta bort denna namnlЖsa dagbokspost?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% fДrdig_t:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-msgid "C_lassification:"
-msgstr "K_lassifikation:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Cancelled"
-msgstr "Avbruten"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "FДrdigt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Datum utfЖrt:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "HЖg"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "PЕgЕr"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "LЕg"
-
-#. add a "None" option to the stores menu
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-account-editor.c:651 mail/mail-account-editor.c:653
-#: mail/mail-config-druid.c:841 mail/mail-config.glade.h:41
-#: shell/e-shell-view.c:1093 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Not Started"
-msgstr "Inte startad"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "S_ummary"
-msgstr "S_ammanfattning"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Sta_rt Date:"
-msgstr "Sta_rtdatum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Uppgift"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Odefinierad"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "_Due Date:"
-msgstr "FЖrfallo_datum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Status:"
-msgstr "_Status:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
 #: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Redigera uppgift"
@@ -2783,7 +1475,6 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Classification"
 msgstr "Klassifikation"
 
@@ -2799,6 +1490,10 @@ msgstr "Slutdatum"
 msgid "Start Date"
 msgstr "Startdatum"
 
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "FЖrfallodatum"
+
 #: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr "Geografisk position"
@@ -2807,6 +1502,10 @@ msgstr "Geografisk position"
 msgid "Precent complete"
 msgstr "Procent klar"
 
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Prioritet"
+
 #: calendar/gui/e-calendar-table.c:163
 msgid "Summary"
 msgstr "Sammanfattning"
@@ -2839,6 +1538,11 @@ msgstr "Markera som fДrdig"
 msgid "Mark the task complete"
 msgstr "Markera uppgiften som fДrdig"
 
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Ta bort"
+
 #: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Ta bort uppgiften"
@@ -2850,62 +1554,61 @@ msgstr "%02i minutdivisioner"
 
 #. 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:1213
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1227
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1240
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:289
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:292
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
-#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3172
-#: calendar/gui/e-week-view.c:3179 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Nytt mЖte..."
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Redigera detta mЖte..."
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3177
-#: ui/evolution-event-editor.xml.h:15
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Ta bort detta mЖte"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3184
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "GЖr detta mЖte flyttbart"
 
-#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Ta bort denna fЖrekomst"
 
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3186
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Ta bort alla fЖrekomster"
 
@@ -2931,166 +1634,10 @@ msgstr "Metoden som krДvs fЖr att lДsa in \"%s\" stЖds inte"
 #. 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
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "He_ldagsarrangemang"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "GrundlДggande mЖtessaker"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Anpassad upprepning"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "dag"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "Var"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Undantag"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "timme"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "E-posta _till:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "minut"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "дndra"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Ingen upprepning"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "FЖrhandsgranska"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pri_vat"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "Pu_blikt"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Upprepning"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Upprepningsregel"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "PЕminnare"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Enkel upprepning"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "Sa_mmanfattning:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Ljud"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Konfidentiellt"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "_Kontakter"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Visa"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Slutti_d:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_E-post"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Program"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "_KЖr program:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "_Starttid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "_Startdatum:"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dag"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "i"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "fЖr alltid"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mЕnad"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "till"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "vecka"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "Еr"
-
 #: calendar/gui/event-editor.c:331
 msgid "Edit Appointment"
 msgstr "Redigera mЖte"
@@ -3103,6 +1650,34 @@ msgstr "vid"
 msgid "day"
 msgstr "dag"
 
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "mЕndag"
+
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "tisdag"
+
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "torsdag"
+
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "fredag"
+
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "lЖrdag"
+
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "sЖndag"
+
 #: calendar/gui/event-editor.c:561
 msgid "on the"
 msgstr "den"
@@ -3125,68 +1700,43 @@ msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
 #: calendar/gui/gnome-cal.c:696
+#, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte Жppna mappen i \"%s\""
 
 #: calendar/gui/gnome-cal.c:707
+#, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krДvs fЖr att Жppna \"%s\" stЖds inte"
 
-#: calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "april"
-
-#: calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "augusti"
-
-#: calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "december"
-
-#: calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "februari"
-
-#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "GЕ till datum"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "GЕ till idag"
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
-msgstr "januari"
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
-msgstr "juli"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "sЖn"
 
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
-msgstr "juni"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "mЕn"
 
-#: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
-msgstr "mars"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "tis"
 
-#: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
-msgstr "maj"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "ons"
 
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
-msgstr "november"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "tor"
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
-msgstr "oktober"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "fre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
-msgstr "september"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "lЖr"
 
 #: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
@@ -4125,7 +2675,6 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:56
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4199,7 +2748,7 @@ msgstr ""
 "autentisering. Detta bЖr fungera fЖr anslutning till de flesta SMTP-servrar."
 
 #: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295 mail/mail-config.glade.h:10
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -4341,12 +2890,11 @@ msgid "attachment"
 msgstr "bilaga"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -4362,18 +2910,6 @@ msgstr "LДgg till bilaga..."
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-msgid "Attachment properties"
-msgstr "Egenskaper hos bilagan"
-
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-typ:"
-
 #: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
 #: mail/mail-format.c:624
 msgid "From:"
@@ -4513,7 +3049,7 @@ msgstr "Skriv ett meddelande"
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fЖnster fЖr meddelanderedigering."
 
-#: composer/evolution-composer.c:345
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
@@ -4649,7 +3185,7 @@ msgstr "inkommande"
 msgid "outgoing"
 msgstr "utgЕende"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
@@ -4753,30 +3289,6 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "LДs"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redigera virtuella mappar"
-
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Inkommande"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "UtgЕende"
-
-#: filter/filter.glade.h:10
-msgid "Virtual Folders"
-msgstr "Virtuella mappar"
-
-#: filter/filter.glade.h:11
-msgid "vFolder Sources"
-msgstr "KДllor fЖr virtuella mappar"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -5023,27 +3535,35 @@ msgstr "Filtrera pЕ mottagare"
 msgid "Filter on Mailing List"
 msgstr "Filtrera pЕ sДndlista"
 
-#: mail/folder-browser.c:658 ui/evolution-message-composer.xml.h:10
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "жppna"
 
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Redigera"
+
 #: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Spara som..."
 
+#: mail/folder-browser.c:661 mail/mail-view.c:148
+msgid "Print"
+msgstr "Skriv ut"
+
 #: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Svara till avsДndaren"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:666 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:666
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
@@ -5082,47 +3602,33 @@ msgstr "Skapa regel frЕn meddelande"
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera pЕ sДndlista (%s)"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Aktuellt lagringsformat:"
-
-#: mail/local-config.glade.h:2
-msgid "Mailbox Format"
-msgstr "BrevlЕdeformat"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Nytt lagringsformat:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Notera: NДr du konverterar mellan brevlЕdeformat, kan ett fel\n"
-"(sЕsom utrymmesbrist pЕ disken) inte automatiskt rДttas till.\n"
-"AnvДnd denna finess med fЖrsiktighet."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
+#: mail/mail-accounts.c:115
+#, fuzzy
+msgid " (default)"
+msgstr "Standard"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:341
+#: mail/mail-accounts.c:347
 msgid "Evolution Account Manager"
 msgstr "Evolution Kontohantering"
 
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:608
+#: mail/mail-account-editor.c:634
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoeditor"
 
@@ -5255,240 +3761,7 @@ msgstr "Skriv ut meddelande"
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-config.glade.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: mail/mail-config.glade.h:2
-msgid "Account Information"
-msgstr "Kontoinformation"
-
-#: mail/mail-config.glade.h:3
-msgid "Account Management"
-msgstr "Kontohantering"
-
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Kontoegenskaper"
-
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: mail/mail-config.glade.h:7
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
-msgstr "Autentiseringstyp:"
-
-#: mail/mail-config.glade.h:11
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-"Grattis, din e-postkonfiguration Дr nu klar.\n"
-"\n"
-"Du kan nu skicka och ta emot e-post med Evolution.\n"
-"\n"
-"Klicka pЕ \"SlutfЖr\" fЖr att spara dina instДllningar."
-
-#: mail/mail-config.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:18
-msgid "Default"
-msgstr "Standard"
-
-#: mail/mail-config.glade.h:20
-msgid "Done"
-msgstr "Klar"
-
-#: mail/mail-config.glade.h:21
-msgid "E-Mail Address:"
-msgstr "E-postadress:"
-
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "E-postadress:"
-
-#: mail/mail-config.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Evolution e-postkonfiguration"
-
-#: mail/mail-config.glade.h:25
-msgid "Full Name:"
-msgstr "FullstДndigt namn:"
-
-#: mail/mail-config.glade.h:28
-msgid "Hostname:"
-msgstr "VДrd:"
-
-#: mail/mail-config.glade.h:29
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "Server fЖr inkommande post"
-
-#: mail/mail-config.glade.h:31
-msgid "Keep mail on server"
-msgstr "Spara meddelanden pЕ servern"
-
-#: mail/mail-config.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:33
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/mail-config.glade.h:34
-msgid "Mail Account"
-msgstr "Epostkonton"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail Configuration"
-msgstr "E-postkonfiguration"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "E-postkonfigurationsguide"
-
-#: mail/mail-config.glade.h:37
-msgid "Make this my default account"
-msgstr "GЖr detta till mitt standardkonto"
-
-#: mail/mail-config.glade.h:38
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: mail/mail-config.glade.h:40
-msgid "News"
-msgstr "Diskussionsgrupper"
-
-#: mail/mail-config.glade.h:42
-msgid "Optional"
-msgstr "Valfri"
-
-#: mail/mail-config.glade.h:43
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config.glade.h:44
-msgid "Outgoing Mail Server"
-msgstr "Server fЖr utgЕende post"
-
-#: mail/mail-config.glade.h:45
-msgid "Password:"
-msgstr "LЖsenord:"
-
-#: mail/mail-config.glade.h:47
-msgid "Plain Text"
-msgstr "Vanlig text"
-
-#: mail/mail-config.glade.h:48
-msgid "Receiving Email"
-msgstr "Tar emot e-post"
-
-#: mail/mail-config.glade.h:49
-msgid "Remember my password"
-msgstr "Kom ihЕg mitt lЖsenord"
-
-#: mail/mail-config.glade.h:50 mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Svara-Till:"
-
-#: mail/mail-config.glade.h:51
-msgid "Required"
-msgstr "KrДvs"
-
-#: mail/mail-config.glade.h:52
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config.glade.h:53
-msgid "Save password"
-msgstr "Spara lЖsenord"
-
-#: mail/mail-config.glade.h:54
-msgid "Select signature file"
-msgstr "VДlj signaturfil"
-
-#: mail/mail-config.glade.h:55
-msgid "Sending Email"
-msgstr "Skickar e-post"
-
-#: mail/mail-config.glade.h:57
-msgid "Server Configuration"
-msgstr "Serverkonfiguration"
-
-#: mail/mail-config.glade.h:58
-msgid "Server Type: "
-msgstr "Servertyp: "
-
-#: mail/mail-config.glade.h:59
-msgid "Server requires authentication"
-msgstr "Servern krДver autentisering"
-
-#: mail/mail-config.glade.h:60
-msgid "Servers"
-msgstr "Servrar"
-
-#: mail/mail-config.glade.h:61
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:62
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: mail/mail-config.glade.h:63
-msgid "Sources"
-msgstr "KДllor"
-
-#: mail/mail-config.glade.h:64
-msgid "This server requires a secure connection (SSL)"
-msgstr "Servern krДver en sДker anslutning (SSL)"
-
-#: mail/mail-config.glade.h:65
-msgid "Type"
-msgstr "Typ"
-
-#: mail/mail-config.glade.h:66
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Skriv in namnet som du vill anvДnda fЖr att referera till dessa servrar, "
-"till exempel: \"Jobb\" eller \"Hemma\"."
-
-#: mail/mail-config.glade.h:68
-msgid "User Information"
-msgstr "AnvДndarinformation"
-
-#: mail/mail-config.glade.h:69
-msgid "Username:"
-msgstr "AnvДndarnamn:"
-
-#: mail/mail-config.glade.h:70
-msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-"VДlkommen till Evolutions guide fЖr e-postkonfiguration.\n"
-"\n"
-"Klicka \"NДsta\" fЖr att starta."
-
-#: mail/mail-config-druid.c:360
+#: mail/mail-config-druid.c:363
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5497,7 +3770,7 @@ msgstr ""
 "Misslyckades med att verifiera konfigurationen fЖr inkommande post.\n"
 "Du kan komma att fЕ problem med att hДmta post frЕn %s"
 
-#: mail/mail-config-druid.c:626
+#: mail/mail-config-druid.c:629
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5507,7 +3780,7 @@ msgstr ""
 "Du kan komma att fЕ problem med att skicka post med %s"
 
 #. set window title
-#: mail/mail-config-druid.c:946
+#: mail/mail-config-druid.c:949
 msgid "Evolution Account Wizard"
 msgstr "Kontoguide fЖr Evolution"
 
@@ -5565,6 +3838,10 @@ msgstr "GЖm"
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "Svara-Till:"
+
 #: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
@@ -5692,143 +3969,143 @@ msgstr ""
 msgid "Working"
 msgstr "Jobbar"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "HДmtar e-post frЕn %s"
 
-#: mail/mail-ops.c:92
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "HДmta e-post frЕn %s"
 
-#: mail/mail-ops.c:342
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Det finns ingen ny e-post pЕ %s."
 
-#: mail/mail-ops.c:413
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrerar e-post vid behov"
 
-#: mail/mail-ops.c:415
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtrera e-post vid behov"
 
-#: mail/mail-ops.c:546
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:565
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "Skickar kЖ"
 
-#: mail/mail-ops.c:666
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "Skicka kЖ"
 
-#: mail/mail-ops.c:801 mail/mail-ops.c:808
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "TillДgger \"%s\""
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:811
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "TillДgger ett meddelande utan en Дmnesrad"
 
-#: mail/mail-ops.c:894
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flyttar meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierar meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiera meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:932
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1030
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "GenomsЖker mappar i \"%s\""
 
-#: mail/mail-ops.c:1096 mail/subscribe-dialog.c:347
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1161
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1202 mail/mail-ops.c:1271
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, c-format
 msgid "Opening folder %s"
 msgstr "жppnar mappen %s"
 
-#: mail/mail-ops.c:1333
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr "Synkroniserar mapp"
 
-#: mail/mail-ops.c:1383
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr "TЖmmer mapp"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1450
 #, c-format
 msgid "Retrieving message %s"
 msgstr "HДmtar meddelande %s"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1517
 msgid "Retrieving messages"
 msgstr "HДmtar meddelanden"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1527
 #, 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:1657
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "LДser in mappen %s fЖr %s"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "LДs in mappen %s fЖr %s"
 
-#: mail/mail-ops.c:1825
+#: mail/mail-ops.c:1843
 msgid "Saving messages"
 msgstr "Sparar meddelanden"
 
-#: mail/mail-ops.c:1904
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5837,12 +4114,12 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1931
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5965,27 +4242,27 @@ msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Svara till avsДndaren av det hДr meddelandet"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det hДr meddelandet"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
@@ -6289,9 +4566,14 @@ msgstr "(Ingen mapp visas)"
 msgid "Folders"
 msgstr "Mappar"
 
-#: shell/e-shell-view.c:1097
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -6386,6 +4668,10 @@ msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvДgar."
 
 #: shell/e-storage-set-view.c:338
+msgid "_View"
+msgstr "_Visa"
+
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Visa den markade mappen"
 
@@ -6499,804 +4785,1990 @@ msgstr "StДng av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create a new contact"
-msgstr "Skapa en ny kontakt"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "FIXME: MЖte"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Ta bort en kontakt"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: _MЖtesbegДran"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "SЖk efter en kontakt"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Posta meddelande"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Kontakt"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
-msgid "Stop"
-msgstr "Stopp"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "FIXME: _Uppgift"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Stop Loading"
-msgstr "Stoppa inlДsning"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Uppgifts_begДran"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Visa alla"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Dagbokspost"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Visa alla kontakter"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "FIXME: _Anteckning"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Adressbokskonfiguration..."
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: V_Дlj formulДr..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "Skriv _ut kontakter..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: _Minneslappsstil"
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "_Search for contacts"
-msgstr "_SЖk kontakter"
+#: ui/evolution-contact-editor.xml:24
+#, fuzzy
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Ange utskrifts_stiler"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dagar"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "FIXME: S_kicka"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Spara bilagor..."
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "InstДllningar fЖr kalendern..."
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: _Flytta till mapp..."
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
-msgstr "Skapa ett nytt mЖte"
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopier_a till mapp..."
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Skapa en ny kalender"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "SidinstДllningar:"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: FЖrhands_granska"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Go back in time"
-msgstr "GЕ bakЕt i tiden"
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Klistra in _special... "
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go forward in time"
-msgstr "GЕ framЕt i tiden"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Markera som olДst"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "GЕ till"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Objekt"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to a specific date"
-msgstr "GЕ till ett specifikt datum"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "FIXME: Objek_t"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to present time"
-msgstr "GЕ till nuvarande tid"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _OlДst objekt"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "MЕnad"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: FЖ_rsta objektet i mappen"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "жppna en kalender"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Sista objektet i mappen"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "FЖreg"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standard"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
-msgstr "Skriv ut denna kalender"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "FIXME: _Formatering"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Spara kalender som nЕgot annat"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Anpassa..."
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Show 1 day"
-msgstr "Visa 1 dag"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "FЖre_gЕende"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show 1 month"
-msgstr "Visa 1 mЕnad"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "NДsta"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show 1 week"
-msgstr "Visa 1 vecka"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_Verktygsrader"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show the working week"
-msgstr "Visa arbetsveckan"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "FIXME: _Fil..."
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Idag"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "FIXME: Obj_ekt..."
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Vecka"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objekt..."
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:35
-msgid "_New"
-msgstr "_Ny"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Typsnitt..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_жppna kalender"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: St_ycke..."
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "Skriv _ut denna kalender"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: _Utforma detta formulДr"
 
-#: ui/evolution-contact-editor.xml.h:2
-msgid "Delete this item"
-msgstr "Ta bort detta objekt"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ut_forma ett formulДr..."
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete..."
-msgstr "Ta bort..."
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publicera _formulДr..."
 
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "HjДlp"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blicera formulДr som..."
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Skriv ut ku_vert..."
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Skri_ptfelsЖkare"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Save the contact and close the dialog box"
-msgstr "Spara kontakten och stДng dialogrutan"
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Stavning..."
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "Skicka kontakte_n till annan..."
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_FormulДr"
 
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Skicka _meddelande till kontakt..."
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "FIXME: _Kontakt"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "Skriv _ut..."
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "StДng detta mЖte"
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "FIXME: _Kontakt"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "FIXME: _Kontakt"
+
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "FIXME: _Kontakt"
+
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "FIXME: _Stavning..."
+
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "FIXME: _Kontakt"
+
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "FIXME: _Dagbokspost"
+
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "FIXME: Kopier_a till mapp..."
+
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "FIXME: _Posta meddelande"
+
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "FIXME: _Posta meddelande"
+
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
 msgstr "FIXME: Vidarebefordra som v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nytt mЖte"
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Vidarebefordra"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_Infoga"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "_Verktyg"
+
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "_еtgДrder"
+
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "FЖregЕende"
+
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "GЕ till fЖregЕende objekt"
+
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
 msgstr "FIXME: _Anteckning"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Spara mЖtet och stДng dialogrutan"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "GЕ till nДsta objekt"
+
+#. 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:2471
+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"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Upptagen"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Inte inne"
+
+#: 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 "Bjud _in andra..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Alternativ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Visa _endast arbetstimmar"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Visa ut_zoomade"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Uppdatera ledig/upptagen"
+
+#: 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 "_AutovДlj"
+
+#: 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 "_Alla mДnniskor och resurser"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alla _mДnniskor och en resurs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Folk som k_rДvs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Folk som krДvs _och en resurs"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "MЖtets _starttid:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "MЖtets slu_ttid:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alla nДrvarande"
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MTOTFLS"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
-msgstr "Boka mЖte"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:89
-msgid "Schedule _Meeting"
-msgstr "Boka _mЖte"
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Nu"
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Boka nЕgon typ av mЖte"
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Idag"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Skriv"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H.%M"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Skriv ett nytt meddelande"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I.%M %p"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Kopiera meddelandet till en ny mapp"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "S_Жk"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Skapa regel"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Grupp %i"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "Ma_pp"
+#~ msgid "Add Service"
+#~ msgstr "LДgg till tjДnst"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrera pЕ avsДndare"
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "LДgg till ny tjДnst till sammanfattningen"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtrera pЕ _mottagare"
+#~ msgid "Create a new email"
+#~ msgstr "Skriv ett nytt e-brev"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Forget _Passwords"
-msgstr "GlЖm _lЖsenord"
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "InstДllningar fЖr sammanfattningen..."
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "HДmta e-post"
+#~ msgid "New Mail"
+#~ msgstr "Ny post"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "GЖm _markerade meddelanden"
+#~ msgid "About this application"
+#~ msgstr "Om detta program"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "GЖm _borttagna meddelanden"
+#~ msgid "About..."
+#~ msgstr "Om..."
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "GЖm _lДsta meddelanden"
+#~ msgid "C_lear"
+#~ msgstr "_TЖm"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "E-post_filter..."
+#~ msgid "C_ut"
+#~ msgstr "Klipp _ut"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Hantera prenumerationer..."
+#~ msgid "Clear"
+#~ msgstr "TЖm"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Mar_kera som lДst"
+#~ msgid "Clear the selection"
+#~ msgstr "TЖm markeringen"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Markera som _olДst"
+#~ msgid "Close"
+#~ msgstr "StДng"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flytta"
+#~ msgid "Close the current file"
+#~ msgstr "StДng aktuell fil"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flytta meddelandet till en ny mapp"
+#~ msgid "Copy"
+#~ msgstr "Kopiera"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "FЖrhandsgranskar meddelandet som ska skrivas ut"
+#~ msgid "Copy the selection"
+#~ msgstr "Koiera markeringen"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "FЖrhandsgranska meddelande..."
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Skriv ut meddelande pЕ skrivaren"
+#~ msgid "Cut the selection"
+#~ msgstr "Klipp ut markeringen"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Skriv ut meddelande..."
+#~ msgid "Delete this task"
+#~ msgstr "Ta bort denna uppgift"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svara till _alla"
+#~ msgid "Dump XML"
+#~ msgstr "Kasta XML"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svara till av_sДndaren"
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Kasta anvДndargrДnssnittsbeskrivningen i XML"
 
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_KДlla"
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: Adress_bok..."
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Markera _alla"
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "FIXME: _Tilldela uppgift"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Skicka kЖlagd e-post och hДmta ny e-post"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: _Kontrollera namn"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Visa _alla meddelanden"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: HjДlp"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "TrЕdad meddelandelista"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Oav_slutad uppgift"
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
-msgstr "Virtuell mapp pЕ avsД_ndare"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Infoga fil"
 
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
-msgstr "Virtuell mapp pЕ mottaga_re"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _Upprepning..."
 
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Visa rЕ meddelandekДlla"
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "FIXME: Svara till alla"
 
-#: ui/evolution-mail.xml.h:46
-msgid "_Apply Filters"
-msgstr "TillДmp_a filter"
+#~ msgid "FIXME: S_end Status Report"
+#~ msgstr "FIXME: S_kicka statusrapport"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigura mapp..."
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "FIXME: Skippa fЖrekomst"
 
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Kopiera till mapp..."
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "FIXME: Markera som fДrdig"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "R_edigera meddelande"
+#~ msgid "FIXME: _New Task"
+#~ msgstr "FIXME: Ny Uppgift"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "V_erkstДll tЖmning"
+#~ msgid "FIXME: _Reply"
+#~ msgstr "FIXME: Svara"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrera pЕ Дmne"
+#~ msgid "FIXME: _note"
+#~ msgstr "FIXME: _anteckning"
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "Vidarebe_fordra"
+#~ msgid "FIXME: what goes here?"
+#~ msgstr "FIXME: vad ska vi stoppa hДr?"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Om_vДnd markering"
+#~ msgid "Find"
+#~ msgstr "SЖk"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_E-postkonfiguration..."
+#~ msgid "Find Again"
+#~ msgstr "SЖk igen"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "_Meddelande"
+#~ msgid "Find _Again"
+#~ msgstr "SЖk ige_n..."
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Flytta till mapp..."
+#~ msgid "Modify the file's properties"
+#~ msgstr "дndra filens egenskaper"
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_жppna i nytt fЖnster"
+#~ msgid "N_ext"
+#~ msgstr "N_Дsta"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Skriv _ut meddelande"
+#~ msgid "Paste"
+#~ msgstr "Klistra in"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Spara meddelande so_m..."
+#~ msgid "Paste the clipboard"
+#~ msgstr "Klistra in frЕn urklipp"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_TrЕdat"
+#~ msgid "Print S_etup..."
+#~ msgstr "Skrivar_instДllning..."
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "_еngra borttagning"
+#~ msgid "Print Setup"
+#~ msgstr "SkrivarinstДllningar"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Virtuell mapp pЕ Дmne"
+#~ msgid "Print this item"
+#~ msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor fЖr _virtuella mappar..."
+#~ msgid "Print..."
+#~ msgstr "Skriv ut..."
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Bifoga"
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
-msgstr "Kryptera detta meddelande med PGP"
+#~ msgid "Redo"
+#~ msgstr "GЖr om"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Redo the undone action"
+#~ msgstr "GЖr om den Еngrade ЕtgДrden"
 
-#: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
-msgstr "Infoga en fil som text i meddelandet"
+#~ msgid "Replace"
+#~ msgstr "ErsДtt"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
-msgstr "Infoga textfil..."
+#~ msgid "Replace a string"
+#~ msgstr "ErsДtt en strДng"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "жppna en fil"
+#~ msgid "Save"
+#~ msgstr "Spara"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP-kryptera"
+#~ msgid "Save _As..."
+#~ msgstr "Spara so_m..."
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP-signera"
+#~ msgid "Save and Close"
+#~ msgstr "Spara och stДng"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Spara som"
+#~ msgid "Save the current file"
+#~ msgstr "Spara aktuell fil"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Spara _utkast"
+#~ msgid "Save the task and close the dialog box"
+#~ msgstr "Spara uppgiften och stДng dialogrutan"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Spara i map_p... (FIXME)"
+#~ msgid "Search again for the same string"
+#~ msgstr "SЖk igen efter samma strДng"
 
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
-msgstr "Spara i mapp..."
+#~ msgid "Search for a string"
+#~ msgstr "SЖk efter en strДng"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
-msgstr "Spara aktuell fil med ett annat namn"
+#~ msgid "See online help"
+#~ msgstr "Se online-hjДlpen"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
-msgstr "Spara meddelandet i angiven mapp"
+#~ msgid "Select All"
+#~ msgstr "Markera allt"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Send"
-msgstr "Skicka"
+#~ msgid "Select everything"
+#~ msgstr "Markera alltihop"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
-msgstr "Skicka senar_e"
+#~ msgid "Setup the page settings for your current printer"
+#~ msgstr "StДll in sidinstДllningarna fЖr din aktuella skrivare"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
-msgstr "Skicka senar_e"
+#~ msgid "Undo"
+#~ msgstr "еngra"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
-msgstr "Skicka brevet i HTML-format"
+#~ msgid "Undo the last action"
+#~ msgstr "еngra den senaste ЕtgДrden"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
-msgstr "Skicka meddelandet senare"
+#~ msgid "_About..."
+#~ msgstr "_Om..."
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Skicka meddelandet nu"
+#~ msgid "_Close"
+#~ msgstr "S_tДng"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
-msgstr "Skicka detta meddelande nu"
+#~ msgid "_Copy"
+#~ msgstr "_Kopiera"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
-msgstr "Visa/gЖm bilaga"
+#~ msgid "_Debug"
+#~ msgstr "Fels_Жk"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
-msgstr "Visa _bilagor"
+#~ msgid "_Edit"
+#~ msgstr "R_edigera"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
-msgstr "Visa bilagor"
+#~ msgid "_File"
+#~ msgstr "_Arkiv"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
-msgstr "Signera detta meddelande med din PGP-nyckel"
+#~ msgid "_Find..."
+#~ msgstr "_SЖk..."
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Infoga textfil... (FIXME)"
+#~ msgid "_Help"
+#~ msgstr "_HjДlp"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Open..."
-msgstr "_жppna..."
+#~ msgid "_Paste"
+#~ msgstr "Klistra _in"
 
-#: ui/evolution-message-composer.xml.h:43
-msgid "_Security"
-msgstr "_SДkerhet"
+#~ msgid "_Print"
+#~ msgstr "Skriv _ut"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "LДgg till mapp till din lista Жver prenumererade mappar"
+#~ msgid "_Properties..."
+#~ msgstr "_Egenskaper..."
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List"
-msgstr "Uppdatera lista"
+#~ msgid "_Redo"
+#~ msgstr "_GЖr om"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Refresh List of Folders"
-msgstr "Uppdatera listan med mappar"
+#~ msgid "_Replace..."
+#~ msgstr "_ErsДtt..."
 
-#: ui/evolution-subscribe.xml.h:6
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ta bort mapp frЕn din lista Жver prenumererade mappar"
+#~ msgid "_Save"
+#~ msgstr "_Spara"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Subscribe"
-msgstr "Prenumerera"
+#~ msgid "_Undo"
+#~ msgstr "_еngra"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Unsubscribe"
-msgstr "SДg upp prenumeration"
+#~ msgid "Alter preferences"
+#~ msgstr "дndra instДllningar"
 
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Om Evolution..."
+#~ msgid "Create a new task"
+#~ msgstr "Skapa en ny uppgift"
 
-#: ui/evolution.xml.h:2
-msgid "Customi_ze"
-msgstr "_Anpassa"
+#~ msgid "Save task as something else"
+#~ msgstr "Spara uppgift som nЕgot annat"
 
-#: ui/evolution.xml.h:3
-msgid "Customize"
-msgstr "Anpassa"
+#~ msgid "Tasks Preferences..."
+#~ msgstr "InstДllningar fЖr uppgifter..."
 
-#: ui/evolution.xml.h:4
-msgid "Customize toolbars"
-msgstr "Anpassa verktygsrader"
+#~ msgid "_Save As..."
+#~ msgstr "_Spara som..."
 
-#: ui/evolution.xml.h:5
-msgid "Display a different folder"
-msgstr "Visa en annan mapp"
+#~ msgid "Delete Contact?"
+#~ msgstr "Ta bort kontakten?"
 
-#: ui/evolution.xml.h:6
-msgid "E_xit"
-msgstr "_Avsluta"
+#~ msgid "Address _2:"
+#~ msgstr "Adress _2:"
 
-#: ui/evolution.xml.h:7
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-genvДg fЖr _rader"
+#~ msgid "Canada"
+#~ msgstr "Kanada"
 
-#: ui/evolution.xml.h:8
-msgid "Exit"
-msgstr "Avsluta"
+#~ msgid "Check Address"
+#~ msgstr "Kontrollera adress"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Avlsuta programmet"
+#~ msgid "Countr_y:"
+#~ msgstr "_Land:"
 
-#: ui/evolution.xml.h:10
-msgid "Getting _Started"
-msgstr "Komma i _gЕng"
+#~ msgid "Finland"
+#~ msgstr "Finland"
 
-#: ui/evolution.xml.h:11
-msgid "Import an external file format"
-msgstr "Importera ett externt filformat"
+#~ msgid "USA"
+#~ msgstr "USA"
 
-#: ui/evolution.xml.h:12
-msgid "Main toolbar"
-msgstr "Huvudverktygsrad"
+#~ msgid "_Address:"
+#~ msgstr "_Adress:"
 
-#: ui/evolution.xml.h:13
-msgid "Show information about Evolution"
-msgstr "Visa information om Evolution"
+#~ msgid "_City:"
+#~ msgstr "_Ort:"
 
-#: ui/evolution.xml.h:14
-msgid "Show the _Folder Bar"
-msgstr "Visa _mappraden"
+#~ msgid "_PO Box:"
+#~ msgstr "_Box:"
 
-#: ui/evolution.xml.h:15
-msgid "Show the _Shortcut Bar"
-msgstr "Visa _genvДgsraden"
+#~ msgid "_State/Province:"
+#~ msgstr "Del_stat/Provins:"
 
-#: ui/evolution.xml.h:16
-msgid "Submit Bug Report"
-msgstr "Skicka felrapport"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Postnummer:"
 
-#: ui/evolution.xml.h:17
-msgid "Submit _Bug Report"
-msgstr "Skicka _felrapport"
+#~ msgid "Addressbook Sources"
+#~ msgstr "AdressbokskДllor"
 
-#: ui/evolution.xml.h:18
-msgid "Submit bug report using Bug Buddy."
-msgstr "Skicka felrapport med Bug-Buddy."
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#: ui/evolution.xml.h:19
-msgid "Toggle whether to show the folder bar"
-msgstr "VДxla om mappraden ska visas"
+#~ msgid "Find..."
+#~ msgstr "SЖk..."
 
-#: ui/evolution.xml.h:20
-msgid "Toggle whether to show the shortcut bar"
-msgstr "VДxla om genvДgsraden ska visas"
+#~ msgid "Message Recipients"
+#~ msgstr "Mottagare"
 
-#: ui/evolution.xml.h:21
-msgid "Using the C_ontact Manager"
-msgstr "AnvДnda k_ontakthanteraren"
+#~ msgid "Select Names"
+#~ msgstr "Markera namn"
 
-#: ui/evolution.xml.h:22
-msgid "Using the _Calendar"
-msgstr "AnvДnda _kalendern"
+#~ msgid "Select name from:"
+#~ msgstr "VДlj namn frЕn:"
 
-#: ui/evolution.xml.h:23
-msgid "Using the _Mailer"
-msgstr "AnvДnda _e-postdelen"
+#~ msgid "123"
+#~ msgstr "123"
 
-#: ui/evolution.xml.h:24
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
+#~ msgid "a"
+#~ msgstr "a"
 
-#: ui/evolution.xml.h:25
-msgid "_Appointment (FIXME)"
-msgstr "_MЖte (FIXME)"
+#~ msgid "b"
+#~ msgstr "b"
 
-#: ui/evolution.xml.h:26
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
+#~ msgid "c"
+#~ msgstr "c"
 
-#: ui/evolution.xml.h:29
-msgid "_Folder"
-msgstr "_Mapp"
+#~ msgid "d"
+#~ msgstr "d"
 
-#: ui/evolution.xml.h:30
-msgid "_Go to Folder..."
-msgstr "_GЕ till mapp..."
+#~ msgid "e"
+#~ msgstr "e"
 
-#: ui/evolution.xml.h:32
-msgid "_Import file..."
-msgstr "_Infoga fil..."
+#~ msgid "f"
+#~ msgstr "f"
 
-#: ui/evolution.xml.h:33
-msgid "_Index"
-msgstr "_Index"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: ui/evolution.xml.h:34
-msgid "_Mail message"
-msgstr "_Posta meddelande"
+#~ msgid "h"
+#~ msgstr "h"
 
-#: ui/evolution.xml.h:36
-msgid "_Settings"
-msgstr "_InstДllningar"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ui/evolution.xml.h:37
-msgid "_Task (FIXME)"
-msgstr "_Uppgift (FIXME)"
+#~ msgid "j"
+#~ msgstr "j"
 
-#. 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "PreliminДr"
+#~ msgid "l"
+#~ msgstr "l"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Upptagen"
+#~ msgid "m"
+#~ msgstr "m"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Inte inne"
+#~ msgid "n"
+#~ msgstr "n"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen information"
+#~ msgid "o"
+#~ msgstr "o"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Bjud _in andra..."
+#~ msgid "p"
+#~ msgstr "p"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativ"
+#~ msgid "q"
+#~ msgstr "q"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Visa _endast arbetstimmar"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Visa ut_zoomade"
+#~ msgid "s"
+#~ msgstr "s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Uppdatera ledig/upptagen"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "u"
+#~ msgstr "u"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_AutovДlj"
+#~ msgid "v"
+#~ msgstr "v"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alla mДnniskor och resurser"
+#~ msgid "x"
+#~ msgstr "x"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alla _mДnniskor och en resurs"
+#~ msgid "y"
+#~ msgstr "y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Folk som k_rДvs"
+#~ msgid "z"
+#~ msgstr "z"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Folk som krДvs _och en resurs"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "MЖtets _starttid:"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "MЖtets slu_ttid:"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Tomma blanketter vid slutet:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alla nДrvarande"
+#~ msgid "Body"
+#~ msgstr "Meddelandetext"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "MTOTFLS"
+#~ msgid "Bottom:"
+#~ msgstr "Underst:"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensioner:"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#~ msgid "Font..."
+#~ msgstr "Typsnitt..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nu"
+#~ msgid "Fonts"
+#~ msgstr "Typsnitt"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H.%M"
+#~ msgid "Footer:"
+#~ msgstr "Sidfot:"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I.%M %p"
+#~ msgid "Format"
+#~ msgstr "Format"
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "S_Жk"
+#~ msgid "Header"
+#~ msgstr "Rubrik"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupp %i"
+#~ msgid "Header/Footer"
+#~ msgstr "Rubrik/sidfot"
+
+#~ msgid "Headings"
+#~ msgstr "Rubriker"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Rubriker fЖr varje brev"
+
+#~ msgid "Height:"
+#~ msgstr "HЖjd:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "FЖlj omedelbart efter varandra"
+
+#~ msgid "Include:"
+#~ msgstr "Inkludera:"
+
+#~ msgid "Landscape"
+#~ msgstr "Liggande"
+
+#~ msgid "Left:"
+#~ msgstr "VДnster:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Brevflikar pЕ sidan"
+
+#~ msgid "Margins"
+#~ msgstr "Marginaler"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Antal kolumner:"
+
+#~ msgid "Options"
+#~ msgstr "Alternativ"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
+
+#~ msgid "Page"
+#~ msgstr "Sida"
+
+#~ msgid "Paper"
+#~ msgstr "Papper"
+
+#~ msgid "Paper source:"
+#~ msgstr "PapperskДlla:"
+
+#~ msgid "Portrait"
+#~ msgstr "StЕende"
+
+#~ msgid "Preview:"
+#~ msgstr "FЖrhandsgranska:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Skriv ut med grЕ skuggning"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "VДnd jДmna sidor"
+
+#~ msgid "Right:"
+#~ msgstr "HЖger:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sektioner:"
+
+#~ msgid "Shading"
+#~ msgstr "Skuggning"
+
+#~ msgid "Size:"
+#~ msgstr "Storlek:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "BЖrja pЕ en ny sida"
+
+#~ msgid "Style name:"
+#~ msgstr "Stil:"
+
+#~ msgid "Top:"
+#~ msgstr "жverst:"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Width:"
+#~ msgstr "Bredd:"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Edit appointment"
+#~ msgstr "Redigera mЖte"
+
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Slumringstid (minuter)"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minuter"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minuter"
+
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 timmar (fm/em)"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minuter"
+
+#~ msgid "24 hour"
+#~ msgstr "24 timmar"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minuter"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minuter"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Ljudalarm stДngs av efter"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Ljudalarm"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Pip nДr alarmfЖnster visas."
+
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "KalenderinstДllningar"
+
+#~ msgid "Colors"
+#~ msgstr "FДrger"
+
+#~ msgid "Compress weekends"
+#~ msgstr "Tryck ihop helger"
+
+#~ msgid "Date navigator options"
+#~ msgstr "Alternativ fЖr datumnavigerare"
+
+#~ msgid "Defaults"
+#~ msgstr "StandardvДrden"
+
+#~ msgid "Display options"
+#~ msgstr "Visningsalternativ"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Aktivera slummer i"
+
+#~ msgid "End of day:"
+#~ msgstr "Dagen slutar:"
+
+#~ msgid "First day of week:"
+#~ msgstr "FЖrsta dagen i veckan:"
+
+#~ msgid "Highlight"
+#~ msgstr "Markera"
+
+#~ msgid "Items Due Today"
+#~ msgstr "objekt som ska ha utfЖrts idag"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Objekt som ska ha utfЖrts idag:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "objekt som inte ska utfЖras Дn"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Obejkt som inte ska utfЖras Дn:"
+
+#~ msgid "Overdue Items"
+#~ msgstr "objekt som skulle ha utfЖrts"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Objekt som skulle ha utfЖrts:"
+
+#~ msgid "Pick a color"
+#~ msgstr "VДlj en fДrg"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "PЕminn mig om alla mЖten"
+
+#~ msgid "Reminders"
+#~ msgstr "PЕminnare"
+
+#~ msgid "Show"
+#~ msgstr "Visa"
+
+#~ msgid "Show appointment end times"
+#~ msgstr "Visa sluttiderna pЕ mЖten"
+
+#~ msgid "Show week numbers"
+#~ msgstr "Visa veckonummer"
+
+#~ msgid "Start of day:"
+#~ msgstr "Dagen startar:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Uppgiftsyta"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tid till fЖrfallodatum"
+
+#~ msgid "Time divisions:"
+#~ msgstr "Tidsdivisioner:"
+
+#~ msgid "Time format:"
+#~ msgstr "Tidsformat:"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuella alarm"
+
+#~ msgid "Work week"
+#~ msgstr "Arbetsvecka"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "minuter innan de sker."
+
+#~ msgid "seconds."
+#~ msgstr "sekunder."
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% fДrdig_t:"
+
+#~ msgid "C_lassification:"
+#~ msgstr "K_lassifikation:"
+
+#~ msgid "Cancelled"
+#~ msgstr "Avbruten"
+
+#~ msgid "Completed"
+#~ msgstr "FДrdigt"
+
+#~ msgid "Date Completed:"
+#~ msgstr "Datum utfЖrt:"
+
+#~ msgid "High"
+#~ msgstr "HЖg"
+
+#~ msgid "In Progress"
+#~ msgstr "PЕgЕr"
+
+#~ msgid "Low"
+#~ msgstr "LЕg"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Not Started"
+#~ msgstr "Inte startad"
+
+#~ msgid "S_ummary"
+#~ msgstr "S_ammanfattning"
+
+#~ msgid "Sta_rt Date:"
+#~ msgstr "Sta_rtdatum:"
+
+#~ msgid "Task"
+#~ msgstr "Uppgift"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Undefined"
+#~ msgstr "Odefinierad"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontakter..."
+
+#~ msgid "_Due Date:"
+#~ msgstr "FЖrfallo_datum:"
+
+#~ msgid "_Priority:"
+#~ msgstr "_Prioritet:"
+
+#~ msgid "_Status:"
+#~ msgstr "_Status:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "A_ll day event"
+#~ msgstr "He_ldagsarrangemang"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "GrundlДggande mЖtessaker"
+
+#~ msgid "Custom recurrence"
+#~ msgstr "Anpassad upprepning"
+
+#~ msgid "Days"
+#~ msgstr "dag"
+
+#~ msgid "Every"
+#~ msgstr "Var"
+
+#~ msgid "Exceptions"
+#~ msgstr "Undantag"
+
+#~ msgid "Hours"
+#~ msgstr "timme"
+
+#~ msgid "Mail _to:"
+#~ msgstr "E-posta _till:"
+
+#~ msgid "Minutes"
+#~ msgstr "minut"
+
+#~ msgid "Modify"
+#~ msgstr "дndra"
+
+#~ msgid "No recurrence"
+#~ msgstr "Ingen upprepning"
+
+#~ msgid "Preview"
+#~ msgstr "FЖrhandsgranska"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blikt"
+
+#~ msgid "Recurrence"
+#~ msgstr "Upprepning"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Upprepningsregel"
+
+#~ msgid "Reminder"
+#~ msgstr "PЕminnare"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Enkel upprepning"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Sa_mmanfattning:"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "_Audio"
+#~ msgstr "_Ljud"
+
+#~ msgid "_Confidential"
+#~ msgstr "_Konfidentiellt"
+
+#~ msgid "_Contacts"
+#~ msgstr "_Kontakter"
+
+#~ msgid "_Display"
+#~ msgstr "_Visa"
+
+#~ msgid "_End time:"
+#~ msgstr "Slutti_d:"
+
+#~ msgid "_Mail"
+#~ msgstr "_E-post"
+
+#~ msgid "_Program"
+#~ msgstr "_Program"
+
+#~ msgid "_Run program:"
+#~ msgstr "_KЖr program:"
+
+#~ msgid "_Start time:"
+#~ msgstr "_Starttid:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Startdatum:"
+
+#~ msgid "day(s)"
+#~ msgstr "dag"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "for"
+#~ msgstr "i"
+
+#~ msgid "forever"
+#~ msgstr "fЖr alltid"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "month(s)"
+#~ msgstr "mЕnad"
+
+#~ msgid "until"
+#~ msgstr "till"
+
+#~ msgid "week(s)"
+#~ msgstr "vecka"
+
+#~ msgid "year(s)"
+#~ msgstr "Еr"
+
+#~ msgid "April"
+#~ msgstr "april"
+
+#~ msgid "August"
+#~ msgstr "augusti"
+
+#~ msgid "December"
+#~ msgstr "december"
+
+#~ msgid "February"
+#~ msgstr "februari"
+
+#~ msgid "Go To Date"
+#~ msgstr "GЕ till datum"
+
+#~ msgid "Go To Today"
+#~ msgstr "GЕ till idag"
+
+#~ msgid "January"
+#~ msgstr "januari"
+
+#~ msgid "July"
+#~ msgstr "juli"
+
+#~ msgid "June"
+#~ msgstr "juni"
+
+#~ msgid "March"
+#~ msgstr "mars"
+
+#~ msgid "May"
+#~ msgstr "maj"
+
+#~ msgid "November"
+#~ msgstr "november"
+
+#~ msgid "October"
+#~ msgstr "oktober"
+
+#~ msgid "September"
+#~ msgstr "september"
+
+#~ msgid "Attachment properties"
+#~ msgstr "Egenskaper hos bilagan"
+
+#~ msgid "File name:"
+#~ msgstr "Filnamn:"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME-typ:"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Redigera virtuella mappar"
+
+#~ msgid "Filter Rules"
+#~ msgstr "Filterregler"
+
+#~ msgid "Incoming"
+#~ msgstr "Inkommande"
+
+#~ msgid "Outgoing"
+#~ msgstr "UtgЕende"
+
+#~ msgid "Virtual Folders"
+#~ msgstr "Virtuella mappar"
+
+#~ msgid "vFolder Sources"
+#~ msgstr "KДllor fЖr virtuella mappar"
+
+#~ msgid "Current store format:"
+#~ msgstr "Aktuellt lagringsformat:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "BrevlЕdeformat"
+
+#~ msgid "New store format:"
+#~ msgstr "Nytt lagringsformat:"
+
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure\n"
+#~ "(such as lack of disk space) may not be automatically\n"
+#~ "recoverable.  Please use this feature with care."
+#~ msgstr ""
+#~ "Notera: NДr du konverterar mellan brevlЕdeformat, kan ett fel\n"
+#~ "(sЕsom utrymmesbrist pЕ disken) inte automatiskt rДttas till.\n"
+#~ "AnvДnd denna finess med fЖrsiktighet."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Account Information"
+#~ msgstr "Kontoinformation"
+
+#~ msgid "Account Management"
+#~ msgstr "Kontohantering"
+
+#~ msgid "Account Properties"
+#~ msgstr "Kontoegenskaper"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Authentication Type:"
+#~ msgstr "Autentiseringstyp:"
+
+#~ msgid ""
+#~ "Congratulations, your mail configuration is complete.\n"
+#~ "\n"
+#~ "You are now ready to send and receive email \n"
+#~ "using Evolution. \n"
+#~ "\n"
+#~ "Click \"Finish\" to save your settings."
+#~ msgstr ""
+#~ "Grattis, din e-postkonfiguration Дr nu klar.\n"
+#~ "\n"
+#~ "Du kan nu skicka och ta emot e-post med Evolution.\n"
+#~ "\n"
+#~ "Klicka pЕ \"SlutfЖr\" fЖr att spara dina instДllningar."
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "Done"
+#~ msgstr "Klar"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-postadress:"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-postadress:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution e-postkonfiguration"
+
+#~ msgid "Full Name:"
+#~ msgstr "FullstДndigt namn:"
+
+#~ msgid "Hostname:"
+#~ msgstr "VДrd:"
+
+#~ msgid "Identity"
+#~ msgstr "Identitet"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server fЖr inkommande post"
+
+#~ msgid "Keep mail on server"
+#~ msgstr "Spara meddelanden pЕ servern"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail"
+#~ msgstr "E-post"
+
+#~ msgid "Mail Account"
+#~ msgstr "Epostkonton"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "E-postkonfiguration"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "E-postkonfigurationsguide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "GЖr detta till mitt standardkonto"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "News"
+#~ msgstr "Diskussionsgrupper"
+
+#~ msgid "Optional"
+#~ msgstr "Valfri"
+
+#~ msgid "Organization:"
+#~ msgstr "Organisation:"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Server fЖr utgЕende post"
+
+#~ msgid "Password:"
+#~ msgstr "LЖsenord:"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig text"
+
+#~ msgid "Receiving Email"
+#~ msgstr "Tar emot e-post"
+
+#~ msgid "Remember my password"
+#~ msgstr "Kom ihЕg mitt lЖsenord"
+
+#~ msgid "Required"
+#~ msgstr "KrДvs"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Save password"
+#~ msgstr "Spara lЖsenord"
+
+#~ msgid "Select signature file"
+#~ msgstr "VДlj signaturfil"
+
+#~ msgid "Sending Email"
+#~ msgstr "Skickar e-post"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Serverkonfiguration"
+
+#~ msgid "Server Type: "
+#~ msgstr "Servertyp: "
+
+#~ msgid "Server requires authentication"
+#~ msgstr "Servern krДver autentisering"
+
+#~ msgid "Servers"
+#~ msgstr "Servrar"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Signature:"
+#~ msgstr "Signatur:"
+
+#~ msgid "Sources"
+#~ msgstr "KДllor"
+
+#~ msgid "This server requires a secure connection (SSL)"
+#~ msgstr "Servern krДver en sДker anslutning (SSL)"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Skriv in namnet som du vill anvДnda fЖr att referera till dessa servrar, "
+#~ "till exempel: \"Jobb\" eller \"Hemma\"."
+
+#~ msgid "User Information"
+#~ msgstr "AnvДndarinformation"
+
+#~ msgid "Username:"
+#~ msgstr "AnvДndarnamn:"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail Configuration Druid.\n"
+#~ "\n"
+#~ "Click \"Next\" to begin. "
+#~ msgstr ""
+#~ "VДlkommen till Evolutions guide fЖr e-postkonfiguration.\n"
+#~ "\n"
+#~ "Klicka \"NДsta\" fЖr att starta."
+
+#~ msgid "Create a new contact"
+#~ msgstr "Skapa en ny kontakt"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Ta bort en kontakt"
+
+#~ msgid "Find a contact"
+#~ msgstr "SЖk efter en kontakt"
+
+#~ msgid "Print contacts"
+#~ msgstr "Skriv ut kontakter"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "Stop Loading"
+#~ msgstr "Stoppa inlДsning"
+
+#~ msgid "View All"
+#~ msgstr "Visa alla"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visa alla kontakter"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_Adressbokskonfiguration..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Skriv _ut kontakter..."
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_SЖk kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dagar"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "InstДllningar fЖr kalendern..."
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Skapa ett nytt mЖte"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Skapa en ny kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Go back in time"
+#~ msgstr "GЕ bakЕt i tiden"
+
+#~ msgid "Go forward in time"
+#~ msgstr "GЕ framЕt i tiden"
+
+#~ msgid "Go to"
+#~ msgstr "GЕ till"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "GЕ till ett specifikt datum"
+
+#~ msgid "Go to present time"
+#~ msgstr "GЕ till nuvarande tid"
+
+#~ msgid "Month"
+#~ msgstr "MЕnad"
+
+#~ msgid "Open a calendar"
+#~ msgstr "жppna en kalender"
+
+#~ msgid "Prev"
+#~ msgstr "FЖreg"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Skriv ut denna kalender"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Spara kalender som nЕgot annat"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Visa 1 dag"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Visa 1 mЕnad"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Visa 1 vecka"
+
+#~ msgid "Show the working week"
+#~ msgstr "Visa arbetsveckan"
+
+#~ msgid "Week"
+#~ msgstr "Vecka"
+
+#~ msgid "_New"
+#~ msgstr "_Ny"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_жppna kalender"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Skriv _ut denna kalender"
+
+#~ msgid "Delete this item"
+#~ msgstr "Ta bort detta objekt"
+
+#~ msgid "Delete..."
+#~ msgstr "Ta bort..."
+
+#~ msgid "Help"
+#~ msgstr "HjДlp"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Skriv ut ku_vert..."
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Spara kontakten och stДng dialogrutan"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "Skicka kontakte_n till annan..."
+
+#~ msgid "Send _message to contact..."
+#~ msgstr "Skicka _meddelande till kontakt..."
+
+#~ msgid "_Print..."
+#~ msgstr "Skriv _ut..."
+
+#~ msgid "Close this appointment"
+#~ msgstr "StДng detta mЖte"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Nytt mЖte"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Spara mЖtet och stДng dialogrutan"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Boka mЖte"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Boka _mЖte"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Boka nЕgon typ av mЖte"
+
+#~ msgid "Compose"
+#~ msgstr "Skriv"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Skriv ett nytt meddelande"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopiera meddelandet till en ny mapp"
+
+#~ msgid "Create Rule"
+#~ msgstr "Skapa regel"
+
+#~ msgid "F_older"
+#~ msgstr "Ma_pp"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrera pЕ avsДndare"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtrera pЕ _mottagare"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "GlЖm _lЖsenord"
+
+#~ msgid "Get Mail"
+#~ msgstr "HДmta e-post"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "GЖm _markerade meddelanden"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "GЖm _borttagna meddelanden"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "GЖm _lДsta meddelanden"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "E-post_filter..."
+
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Hantera prenumerationer..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_kera som lДst"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markera som _olДst"
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Flytta meddelandet till en ny mapp"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "FЖrhandsgranskar meddelandet som ska skrivas ut"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "FЖrhandsgranska meddelande..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Skriv ut meddelande pЕ skrivaren"
+
+#~ msgid "Print message..."
+#~ msgstr "Skriv ut meddelande..."
+
+#~ msgid "Reply to _All"
+#~ msgstr "Svara till _alla"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svara till av_sДndaren"
+
+#~ msgid "S_ource"
+#~ msgstr "_KДlla"
+
+#~ msgid "Select _All"
+#~ msgstr "Markera _alla"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "Skicka kЖlagd e-post och hДmta ny e-post"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Visa _alla meddelanden"
+
+#~ msgid "Threaded Message list"
+#~ msgstr "TrЕdad meddelandelista"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Virtuell mapp pЕ avsД_ndare"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Virtuell mapp pЕ mottaga_re"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Visa rЕ meddelandekДlla"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "TillДmp_a filter"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Konfigura mapp..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopiera till mapp..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "R_edigera meddelande"
+
+#~ msgid "_Expunge"
+#~ msgstr "V_erkstДll tЖmning"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrera pЕ Дmne"
+
+#~ msgid "_Forward"
+#~ msgstr "Vidarebe_fordra"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Om_vДnd markering"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_E-postkonfiguration..."
+
+#~ msgid "_Message"
+#~ msgstr "_Meddelande"
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Flytta till mapp..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_жppna i nytt fЖnster"
+
+#~ msgid "_Print Message"
+#~ msgstr "Skriv _ut meddelande"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Spara meddelande so_m..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_TrЕdat"
+
+#~ msgid "_Undelete"
+#~ msgstr "_еngra borttagning"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Virtuell mapp pЕ Дmne"
+
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Editor fЖr _virtuella mappar..."
+
+#~ msgid "Attach"
+#~ msgstr "Bifoga"
+
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Kryptera detta meddelande med PGP"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Infoga en fil som text i meddelandet"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Infoga textfil..."
+
+#~ msgid "Open a file"
+#~ msgstr "жppna en fil"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP-kryptera"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP-signera"
+
+#~ msgid "Save As"
+#~ msgstr "Spara som"
+
+#~ msgid "Save _Draft"
+#~ msgstr "Spara _utkast"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Spara i map_p... (FIXME)"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Spara i mapp..."
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Spara aktuell fil med ett annat namn"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Spara meddelandet i angiven mapp"
+
+#~ msgid "Send"
+#~ msgstr "Skicka"
+
+#~ msgid "Send _Later"
+#~ msgstr "Skicka senar_e"
+
+#~ msgid "Send _later"
+#~ msgstr "Skicka senar_e"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Skicka brevet i HTML-format"
+
+#~ msgid "Send the message later"
+#~ msgstr "Skicka meddelandet senare"
+
+#~ msgid "Send the message now"
+#~ msgstr "Skicka meddelandet nu"
+
+#~ msgid "Send this message now"
+#~ msgstr "Skicka detta meddelande nu"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Visa/gЖm bilaga"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Visa _bilagor"
+
+#~ msgid "Show attachments"
+#~ msgstr "Visa bilagor"
+
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Signera detta meddelande med din PGP-nyckel"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Infoga textfil... (FIXME)"
+
+#~ msgid "_Open..."
+#~ msgstr "_жppna..."
+
+#~ msgid "_Security"
+#~ msgstr "_SДkerhet"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "LДgg till mapp till din lista Жver prenumererade mappar"
+
+#~ msgid "Refresh List"
+#~ msgstr "Uppdatera lista"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Uppdatera listan med mappar"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ta bort mapp frЕn din lista Жver prenumererade mappar"
+
+#~ msgid "Subscribe"
+#~ msgstr "Prenumerera"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "SДg upp prenumeration"
+
+#~ msgid "About Evolution..."
+#~ msgstr "Om Evolution..."
+
+#~ msgid "Customi_ze"
+#~ msgstr "_Anpassa"
+
+#~ msgid "Customize"
+#~ msgstr "Anpassa"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Anpassa verktygsrader"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Visa en annan mapp"
+
+#~ msgid "E_xit"
+#~ msgstr "_Avsluta"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution-genvДg fЖr _rader"
+
+#~ msgid "Exit"
+#~ msgstr "Avsluta"
+
+#~ msgid "Exit the program"
+#~ msgstr "Avlsuta programmet"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Komma i _gЕng"
+
+#~ msgid "Import an external file format"
+#~ msgstr "Importera ett externt filformat"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Huvudverktygsrad"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Visa information om Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Visa _mappraden"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Visa _genvДgsraden"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Skicka felrapport"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "Skicka _felrapport"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "Skicka felrapport med Bug-Buddy."
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "VДxla om mappraden ska visas"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "VДxla om genvДgsraden ska visas"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "AnvДnda k_ontakthanteraren"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "AnvДnda _kalendern"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "AnvДnda _e-postdelen"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Om Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_MЖte (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakt (FIXME)"
+
+#~ msgid "_Folder"
+#~ msgstr "_Mapp"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_GЕ till mapp..."
+
+#~ msgid "_Import file..."
+#~ msgstr "_Infoga fil..."
+
+#~ msgid "_Index"
+#~ msgstr "_Index"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Posta meddelande"
+
+#~ msgid "_Settings"
+#~ msgstr "_InstДllningar"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Uppgift (FIXME)"
 
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr "<b>Fel vid inlДsning av kalender:<br>Kalendern upptagen."
diff --git a/po/tr.po b/po/tr.po
index ad17aaad18..e861a2ab19 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Fatih Demir <kabalak@gmx.net>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,207 +14,378 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo'yu baЧlatamadЩm"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Tel'if hakkЩ (C) 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Iletiyi gЖnder"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "ePosta'yЩ alЩyorum"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Kapat"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "ABY : Dizine _taЧЩ ..."
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Gerideki birime git"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ilerideki birime git"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"DosyalarЩ `%s''ye\n"
+"kopyalayamadЩm ."
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Hata yok"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+msgid "Connect to server"
+msgstr ""
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Yeni"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Yeni bir tanЩk birimi yarat"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "ePosta parГasЩ : Bonobo'yu baЧlatamadЩm"
+
+#: addressbook/backend/ebook/e-card.c:3049
 #, fuzzy
 msgid "Card: "
 msgstr "Araba"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Isim :"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "S_onek :"
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "_DoПum gЭnЭ :"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adres :"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "2.nci ePosta adresi"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "2.nci ePosta adresi"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "2.nci Meslek"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Isim :"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "tЭrler"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 #, fuzzy
 msgid ""
 "\n"
@@ -231,29 +402,18 @@ msgstr "Birim anlatЩmЩ :"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo'yu baЧlatamadЩm"
-
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -369,42 +529,33 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
-#, fuzzy
-msgid "Delete Contact?"
-msgstr "TanЩПЩ sil"
-
-#.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
@@ -414,7 +565,7 @@ msgid "_Add"
 msgstr "_Ekle"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -427,14 +578,7 @@ msgstr "Telefon tipleri"
 msgid "New phone type"
 msgstr "Yeni telefon tipi"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Ekle"
 
@@ -492,7 +636,6 @@ msgid "C_ontacts..."
 msgstr "_TanЩk ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "TЭ_rler ..."
 
@@ -510,8 +653,6 @@ msgid "_Address..."
 msgstr "Adres"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Genel"
 
@@ -556,24 +697,27 @@ msgid "No_tes:"
 msgstr "_Notlar :"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Ince konular"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "YardЩmcЩ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Meslek"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "2.nci Meslek"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Mesleki Faks"
 
@@ -582,6 +726,7 @@ msgid "Callback"
 msgstr "Geri arama"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Araba"
 
@@ -591,28 +736,33 @@ msgstr "чirket"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Ev"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "2.nci ev"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Ev faksЩ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Cep"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "BaЧka"
 
@@ -621,10 +771,12 @@ msgid "Other Fax"
 msgstr "BaЧka faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Haberleyici"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Ilk"
 
@@ -641,67 +793,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "2.nci ePosta adresi"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "3.ncЭ ePosta adresi"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-#, fuzzy
-msgid "Address _2:"
-msgstr "Adres :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#, fuzzy
-msgid "Check Address"
-msgstr "Adres"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#, fuzzy
-msgid "Finland"
-msgstr "Bul"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#, fuzzy
-msgid "_Address:"
-msgstr "Adres :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-#, fuzzy
-msgid "_City:"
-msgstr "_DoПum gЭnЭ :"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr ""
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr ""
-
-#: addressbook/contact-editor/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.
@@ -767,12 +868,7 @@ msgstr "S_onek :"
 msgid "As _Minicards"
 msgstr "_Ufak kartlar olarak"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "гi_zgiye olarak"
 
@@ -805,29 +901,29 @@ 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:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 #, fuzzy
 msgid "Advanced..."
 msgstr "Ekle ..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 #, fuzzy
 msgid "Email contains"
 msgstr "_Ufak ikonalar"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin Gezginini gЖsterecek olan URI"
 
@@ -856,9 +952,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 #, fuzzy
 msgid "Password"
 msgstr "_ParolalarЩ unut"
@@ -895,12 +991,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Saat"
@@ -920,12 +1014,10 @@ msgid "Search Scope:"
 msgstr "Ara ..."
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "DoПrulama :"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Dizin :"
 
@@ -951,198 +1043,92 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Isim :"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "AnlatЩm :"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
 #, fuzzy
-msgid "Addressbook Sources"
-msgstr "Kaynak ekle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Sil"
+msgid "Search"
+msgstr "Ara ..."
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-#, fuzzy
-msgid "Edit"
-msgstr "_DeПiЧtir"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 msgid "Name"
 msgstr "Isim"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "Find..."
-msgstr "Bul"
+msgid "Email"
+msgstr "2.nci ePosta adresi"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:570
 #, fuzzy
-msgid "Message Recipients"
-msgstr "AlЩcЩlar listesi :"
+msgid "Organization"
+msgstr "жrgЭt : "
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "Select Names"
-msgstr "Stil adЩ :"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
-msgid "Select name from:"
-msgstr "Stil adЩ :"
+msgid "Department"
+msgstr "_BЖlЭk :"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 #, fuzzy
-msgid "Search"
-msgstr "Ara ..."
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr "t"
+msgid "Office"
+msgstr "_Ofis :"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr "u"
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "э_styazЩ :"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr "v"
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Meslek :"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr "w"
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Haberleyici"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Lakap :"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_ZЩpzak :"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Yok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "VCard olarak kaydet"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "Adres defterini aГamadЩm"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1156,179 +1142,6 @@ msgstr ""
 "\n"
 "Buraya Гift-tЩklayarak bir tanЩk birimini yarat."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "10 punto Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "8 punto Tahoma"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr "Sonda boЧ formlar olsun :"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "IГerik"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Alt :"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Ebatlar :"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "YazЩ tipi ..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "YazЩ tipleri"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Son :"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "чekil"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "BaЧlЩk"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "BaЧlЩk/son"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "BaЧlЩklar"
-
-#: addressbook/printing/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:20
-msgid "Height:"
-msgstr "YЭkseklik :"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "PeЧpeЧe"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "IГer :"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Manzara"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Sol :"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Mektup tab'lerinin tarafa koy"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Kenarlar"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "SЭtunlarЩn sayЩsЩ :"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "SeГenekler"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Taraflama"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Sayfa"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Sayfa _kurulumu :"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "KaПЩt"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "KaПЩt kaynaПЩ :"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Portre"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "жnizleme :"
-
-#: addressbook/printing/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:37
-msgid "Reverse on even pages"
-msgstr "Ikili sayfalarЩ ters Гevir"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "SaП :"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "BЖlЭmler :"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "GЖlgeleme"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Boyut :"
-
-#: addressbook/printing/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:43
-msgid "Style name:"
-msgstr "Stil adЩ :"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "эst :"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Tip :"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "En :"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "yafta26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1338,13 +1151,13 @@ msgstr "Evolution ГubuПu _kЩsayolu"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1357,72 +1170,17 @@ msgstr "Evolution ГubuПu _kЩsayolu"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Yeni _takvim"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution ГubuПu _kЩsayolu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Ikaz et"
 
@@ -1432,25 +1190,25 @@ msgstr "Ikaz et"
 msgid "Ok"
 msgstr "Oldu"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Dosya bulunamadЩ"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Takvimi aГ"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Takvimi kaydet"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 #, fuzzy
@@ -1459,65 +1217,62 @@ msgstr "%a %b %d %Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 #, fuzzy
 msgid "Private"
 msgstr "YazdЩr"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 #, fuzzy
 msgid "Unknown"
 msgstr "Bilinmeyen hata"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 #, fuzzy
 msgid "S"
 msgstr "Paz."
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 #, fuzzy
 msgid "W"
 msgstr "гarЧ."
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 #, fuzzy
 msgid "Transparent"
 msgstr "ePosta transferi"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1526,7 +1281,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1534,942 +1289,443 @@ 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:865
+#: calendar/gui/calendar-model.c:893
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "Zaman gЖsterimi"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "ToplantЩ - %s"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "_Eklemleri gЖster"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Takvimi yazdЩr"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gЖsterecek olduПu URI"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 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:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 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
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 #, fuzzy
 msgid "No summary available."
 msgstr "Toplama yok"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Kapat"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "ToplantЩyЩ deПiЧtir"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Ikaz zamanЩ ( dakika )"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#, fuzzy
-msgid "05 minutes"
-msgstr "dakika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "10 minutes"
-msgstr "dakika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "12 hour (am/pm)"
-msgstr "12 saat (Ж.Ж./Ж.s.)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "15 minutes"
-msgstr "dakika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "24 hour"
-msgstr "24 saat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
-msgid "30 minutes"
-msgstr "dakika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#, fuzzy
-msgid "60 minutes"
-msgstr "dakika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Alarms timeout after"
-msgstr "Sedai ikazlarЩ kapatma zamanЩ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
-msgid "Audio Alarms"
-msgstr "Ikazlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "Calendar"
-msgstr "Yeni _takvim"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Calendar Preferences"
-msgstr "Ayarlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Renkler"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr "Ince ayarlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "Display options"
-msgstr "\"YapЩlacak\" stil seГenekleri :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr "Tarihe gЖre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "IkazlamayЩ aГ :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Cum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-#, fuzzy
-msgid "Friday"
-msgstr "cuma"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Highlight"
-msgstr "жne getirilmiЧ gЭn :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#, fuzzy
-msgid "Items Due Today"
-msgstr "BugЭn zamanЩ dolacak birimleri \"gЖzЖnЭne\" ser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "P.t"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Pazartesi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Overdue Items"
-msgstr "ZamanЩ geГmiЧ birimleri \"gЖzЖnЭne\" ser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "жnem"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
-msgid "Remind me of all appointments"
-msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "C.t"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-#, fuzzy
-msgid "Saturday"
-msgstr "cumartesi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "Show appointment end times"
-msgstr "ToplantЩ - %s"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#, fuzzy
-msgid "Show week numbers"
-msgstr "2 haftayЩ Жster"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Paz"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Pazar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Per"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-#, fuzzy
-msgid "Thursday"
-msgstr "perЧembe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr "GeГmesine kalan zaman"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#, fuzzy
-msgid "Time divisions:"
-msgstr "%02i dakika bЖlmeleri"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#, fuzzy
-msgid "Time format:"
-msgstr "Zaman Чekli"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Sal"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-#, fuzzy
-msgid "Tuesday"
-msgstr "salЩ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#, fuzzy
-msgid "Visual Alarms"
-msgstr "Ikazlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "гar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-#, fuzzy
-msgid "Wednesday"
-msgstr "ГarЧamba"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#, fuzzy
-msgid "Work week"
-msgstr "Hafta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#, fuzzy
-msgid "seconds."
-msgstr " saniye"
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#, fuzzy
-msgid "Cancelled"
-msgstr "Iptal"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#, fuzzy
-msgid "Completed"
-msgstr "Yaz"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#, fuzzy
-msgid "Date Completed:"
-msgstr "Birim anlatЩmЩ :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#, fuzzy
-msgid "High"
-msgstr "YЭkseklik :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
+#: calendar/gui/dialogs/task-editor.c:690
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Low"
-msgstr "Чimdi"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Yok"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+msgid "No summary"
+msgstr "Toplama yok"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Normal"
-msgstr "чekil"
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#, c-format
+msgid "Appointment - %s"
+msgstr "ToplantЩ - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#, c-format
+msgid "Task - %s"
+msgstr "GЖrev - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#, fuzzy
-msgid "S_ummary"
-msgstr "Toplama"
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#, c-format
+msgid "Journal entry - %s"
+msgstr "GЭnlЭk birimi - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/e-calendar-table.c:154
 #, fuzzy
-msgid "Task"
-msgstr "GЖrev - %s"
+msgid "Categories"
+msgstr "tЭrler"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
-msgid "_Contacts..."
-msgstr "_TanЩk ..."
+msgid "Completion Date"
+msgstr "Yaz"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
-msgid "_Due Date:"
-msgstr "Bu tarihe kadar :"
+msgid "End Date"
+msgstr "ToplantЩ bitiЧ saati :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
-msgid "_Priority:"
-msgstr "жnem :"
+msgid "Start Date"
+msgstr "ToplantЩ baЧlama saati :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#, fuzzy
-msgid "_Status:"
-msgstr "_ZЩpzak :"
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr "Tarihe gЖre"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:681
-msgid "Edit Task"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
-msgid "No summary"
-msgstr "Toplama yok"
-
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
-#, c-format
-msgid "Appointment - %s"
-msgstr "ToplantЩ - %s"
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "жnem"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
-#, c-format
-msgid "Task - %s"
-msgstr "GЖrev - %s"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Toplama"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
-#, c-format
-msgid "Journal entry - %s"
-msgstr "GЭnlЭk birimi - %s"
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "ePosta transferi"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
-msgid "Do you want to save changes?"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:166
+#, fuzzy
+msgid "Alarms"
+msgstr "Ikazlar"
+
+#: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Open..."
 msgstr "_AГ ..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Sil"
+
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Delete the task"
 msgstr "Bu birimi sil"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i dakika bЖlmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 #, 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 #, 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr " Ж.Ж."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr " Ж.s"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Yeni toplantЩ ..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Bu toplantЩyЩ deПiЧtir .."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Bu toplantЩyЩ sil"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Bu toplantЩyЩ taЧЩnabilir yap"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Bu oluЧumu sil"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Yekin oluЧumlarЩ sil"
 
-#. 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 xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "T_oplantЩlar :"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "GeliЧ kurallarЩnЩ ayarla"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "GЭn"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#, fuzzy
-msgid "Exceptions"
-msgstr "SeГenekler"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Saat"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-#, fuzzy
-msgid "Mail _to:"
-msgstr "ePosta kaynaПЩ"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Dakika"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#, fuzzy
-msgid "Modify"
-msgstr "Pazartesi"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-#, fuzzy
-msgid "No recurrence"
-msgstr "GeliЧ kurallarЩnЩ ayarla"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Preview"
-msgstr "жnizleme :"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#, fuzzy
-msgid "Pri_vate"
-msgstr "GeГerli yap"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-#, fuzzy
-msgid "Recurrence"
-msgstr "ABY : GeliЧler ..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#, fuzzy
-msgid "Recurrence Rule"
-msgstr "GeliЧ kurallarЩnЩ ayarla"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/e-tasks.c:146
 #, fuzzy
-msgid "Simple recurrence"
-msgstr "GeliЧ kurallarЩnЩ ayarla"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "Toplama :"
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-#, fuzzy
-msgid "Time"
-msgstr "Kalan zaman"
+msgid "Category:"
+msgstr "tЭrler"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-#, fuzzy
-msgid "_Audio"
-msgstr "_Ekle"
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-#, fuzzy
-msgid "_Display"
-msgstr "Zaman gЖsterimi"
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-#, fuzzy
-msgid "_End time:"
-msgstr "ToplantЩ bitiЧ saati :"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-#, fuzzy
-msgid "_Mail"
-msgstr "_Cep"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
+#. 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:338
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr ""
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "ToplantЩyЩ deПiЧtir"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor.c:409
 #, fuzzy
-msgid "_Start time:"
-msgstr "ToplantЩ baЧlama saati :"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr ""
+msgid "on"
+msgstr "P.t"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "day(s)"
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+msgid "day"
 msgstr "gЭn"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-#, fuzzy
-msgid "for"
-msgstr "dЭrdЭncЭ"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr ""
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Pazartesi"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor.c:436
 #, fuzzy
-msgid "label21"
-msgstr "yafta1"
+msgid "Tuesday"
+msgstr "salЩ"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor.c:437
 #, fuzzy
-msgid "month(s)"
-msgstr "ay"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
+msgid "Wednesday"
+msgstr "ГarЧamba"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor.c:438
 #, fuzzy
-msgid "week(s)"
-msgstr "hafta"
+msgid "Thursday"
+msgstr "perЧembe"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor.c:439
 #, fuzzy
-msgid "year(s)"
-msgstr "yЩl"
-
-#: calendar/gui/event-editor.c:325
-msgid "Edit Appointment"
-msgstr "ToplantЩyЩ deПiЧtir"
+msgid "Friday"
+msgstr "cuma"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:440
 #, fuzzy
-msgid "on"
-msgstr "P.t"
+msgid "Saturday"
+msgstr "cumartesi"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
-msgid "day"
-msgstr "gЭn"
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Pazar"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "Ay"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 #, fuzzy
 msgid "th"
 msgstr "4.ncЭ"
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "Yekin oluЧumlarЩ sil"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:687
+#: calendar/gui/gnome-cal.c:696
 #, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Diyalog kutusunu yaratamadЩm ."
+msgid "Could not open the folder in `%s'"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+" "
 
-#: calendar/gui/gnome-cal.c:698
+#: calendar/gui/gnome-cal.c:707
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "April"
-msgstr "nisan"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
-msgid "August"
-msgstr "aПustos"
-
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
-msgid "December"
-msgstr "aralЩk"
-
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-msgid "February"
-msgstr "Чubat"
-
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "Tarihe git"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "BugЭne git"
-
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
-msgid "January"
-msgstr "ocak"
-
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
-msgid "July"
-msgstr "temmuz"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Paz"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "June"
-msgstr "haziran"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "P.t"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "mart"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Sal"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Pazartesi"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "гar"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
-msgid "November"
-msgstr "kasЩm"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Per"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "ekim"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Cum"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
-msgid "September"
-msgstr "eylЭl"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "C.t"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Bonobo'yu baЧlatamadЩm"
@@ -2666,10 +1922,15 @@ msgstr "GeГerli yЩl ( %Y )"
 msgid "Print Calendar"
 msgstr "Takvimi yazdЩr"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "YazdЩrma Жnizlemesi"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "Takvimin gЖsterecek olduПu URI"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
@@ -2761,61 +2022,69 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Iptal"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Takvimi aГ"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2825,17 +2094,17 @@ msgstr ""
 "\n"
 "Hata : %s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
@@ -2851,40 +2120,41 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2896,25 +2166,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2922,7 +2192,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2931,7 +2201,7 @@ msgstr ""
 "Hata : %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2939,7 +2209,7 @@ 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2947,7 +2217,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3277,8 +2547,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3307,72 +2577,71 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Bilinmeyen hata"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "GЖnder"
@@ -3422,131 +2691,125 @@ msgstr "ePosta'yЩ al"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 #, fuzzy
 msgid "No authentication required"
 msgstr "DoПrulama :"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
+msgstr "Bilinmeyen hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Bilinmeyen hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3591,12 +2854,11 @@ msgid "attachment"
 msgstr "Eklem ekle"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Sil"
 
@@ -3612,58 +2874,42 @@ msgstr "Eklem ekle ..."
 msgid "Attach a file to the message"
 msgstr "Iletiyi bir dosya ekle"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Eklem Жzellikleri"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Dosya adЩ :"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "MIME tЭrЭ :"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 #, fuzzy
 msgid "From:"
 msgstr "GЖnderen"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Adres defteri iГin buraya tЩkla"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 #, 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:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Iletinin gЖnderildiПi kiЧiler"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 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:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3671,11 +2917,11 @@ 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:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Konu :"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Iletinin konusunu ver"
 
@@ -3686,67 +2932,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "FarklЩ kaydet ..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Iletiyi kaydet"
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Iletiyi kaydet"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "DosyayЩ aГ"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "BЖyle bir dosya yok ."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Bu normal bir dosya deПildir ."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Bu dosya vardЩr ama okunabilir deПil ."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 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:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3754,29 +3000,24 @@ 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:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "DosyayЩ okurken bir hata oldu ."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: filter/e-search-bar.c:176
-#, fuzzy
-msgid "Sear_ch"
-msgstr "Ara ..."
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "yЩl"
@@ -3913,7 +3154,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Kitle"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Filtralarla oyna"
@@ -4020,212 +3261,189 @@ msgstr ""
 msgid "Read"
 msgstr "Radyo"
 
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid "Edit VFolders"
-msgstr "Filtralarla oyna"
-
-#: filter/filter.glade.h:11
-#, fuzzy
-msgid "Filter Rules"
-msgstr "Filtra"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "Outgoing"
-msgstr "DЩЧlЩm :"
-
-#: filter/filter.glade.h:15
-#, fuzzy
-msgid "Virtual Folders"
-msgstr "_Sanal Dizin SihirbazЩ ..."
-
-#: filter/filter.glade.h:16
-#, fuzzy
-msgid "vFolder Sources"
-msgstr "Kaynak ekle"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "after"
-msgstr "Tarih"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "contains"
-msgstr "E_ylemler"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "ABY : Dizine _kopyala ..."
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Date received"
 msgstr "AlЩndЩ"
 
-#: filter/libfilter-i18n.h:9
+#: 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
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "BaЧlЩk"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
 #, fuzzy
-msgid "does not exist"
-msgstr "BЖyle bir dosya yok ."
+msgid "Message was sent"
+msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "does not sound like"
-msgstr "Dosya bulunamadЩ"
+msgid "Move to Folder"
+msgstr "ABY : Dizine _taЧЩ ..."
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr ""
+#, fuzzy
+msgid "Recipients"
+msgstr "AlЩcЩlar listesi :"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
 #, fuzzy
-msgid "exists"
-msgstr "Ileri"
+msgid "Score"
+msgstr "SЩrala"
 
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Expression"
-msgstr "_Meslek :"
+msgid "Sender"
+msgstr "GЖnder"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Bu iletiyi ilet"
+msgid "Set Status"
+msgstr "BaПlЩ olma durumu"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "is"
-msgstr "i"
+msgid "Source"
+msgstr "Kaynak ekle"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "C.t"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Message Body"
-msgstr "Ileti(leri) buraya taЧЩ "
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Konu"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "Message Header"
-msgstr "BaЧlЩk"
+msgid "after"
+msgstr "Tarih"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "Message was sent"
-msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
+msgid "contains"
+msgstr "E_ylemler"
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "Move to Folder"
-msgstr "ABY : Dizine _taЧЩ ..."
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "on or after"
-msgstr "Tarihe git"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "does not exist"
+msgstr "BЖyle bir dosya yok ."
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 #, fuzzy
-msgid "Recipients"
-msgstr "AlЩcЩlar listesi :"
+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 "Regex Match"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
 #, fuzzy
-msgid "Sender"
-msgstr "GЖnder"
+msgid "exists"
+msgstr "Ileri"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "BaПlЩ olma durumu"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-#, fuzzy
-msgid "Source"
-msgstr "Kaynak ekle"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr ""
+#, fuzzy
+msgid "is"
+msgstr "i"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr ""
+#, fuzzy
+msgid "on or after"
+msgstr "Tarihe git"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "C.t"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Konu"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4245,11 +3463,6 @@ msgstr "Kaynak ekle"
 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 ""
@@ -4259,228 +3472,177 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr "Filtralarla oyna"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
+#: mail/folder-browser.c:225
 #, fuzzy
-msgid "Save"
-msgstr "C.tesi"
+msgid "Store search as vFolder"
+msgstr "_Dizin"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 #, fuzzy
 msgid "Subject contains"
 msgstr "Konu"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Dosya bulunamadЩ"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Bu sЩralamada gЖster"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "BaЧlЩk"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Sil"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Konu"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Dosya bulunamadЩ"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 #, fuzzy
 msgid "Open"
 msgstr "_AГ ..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+#, fuzzy
+msgid "Edit"
+msgstr "_DeПiЧtir"
+
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Save As..."
 msgstr "FarklЩ kaydet ..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "YazdЩr"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Hepsine cevapla"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "Hepsine cevapla"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Ilet"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Zamanda ileri git"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 #, fuzzy
 msgid "Mark as Read"
 msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Dizinde git ..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Dizinde git ..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 #, fuzzy
 msgid "Undelete"
 msgstr "Sil"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 #, fuzzy
 msgid "Apply Filters"
 msgstr "Filtra"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Iletiyi gЖnder"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Konu"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Bonobo'yu baЧlatamadЩm"
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "чekil"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Yok"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "Yeni telefon tipi"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "Ince ayarlar"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
 #, fuzzy
-msgid "mh"
-msgstr "h"
+msgid "Evolution Account Editor"
+msgstr "Evolution ГubuПu _kЩsayolu"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4502,7 +3664,7 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4510,7 +3672,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -4519,7 +3681,7 @@ msgstr ""
 "ePosta gЖndermeden Жnce bir ePosta\n"
 "hesabЩnЩ ayarlaman lazЩm."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -4528,19 +3690,15 @@ 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4548,539 +3706,93 @@ msgstr ""
 "Bu iletinin konusu yok .\n"
 "Vallahi mi gЖndereyim ?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"ePosta gЖndermeden Жnce bir ePosta\n"
+"hesabЩnЩ ayarlaman lazЩm."
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "AynЩ isimli bir klasЖr zaten var"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Iletiyi kaydet"
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Iletiyi kaydet"
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 #, fuzzy
 msgid "Print Message"
 msgstr "Iletiyi gЖnder"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Bilgi yok"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Eklem Жzellikleri"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Ekle ..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "DoПrulama :"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "DoПrulama :"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Ince ayarlar"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Yok"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "ePosta adresi : "
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "ePosta adresi : "
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "ePosta ayarlamasЩ"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Tam ismi :"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "KullanЩcЩ adЩ :"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "IMAP"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr "Kimlik"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Kerberos"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "_Cep"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "_Ufak ikonalar"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "ePosta ayarlamasЩ"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "ePosta ayarlamasЩ"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Yeni"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "SeГenekler"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "жrgЭt : "
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "_ParolalarЩ unut"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Cevapla"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Cevapla"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "_Gerekli kiЧiler"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "VCard olarak kaydet"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Imza dosyasЩ : "
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "GЖnder"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "ePosta ayarlamasЩ"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Sunucu :"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Sunucu :"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Imza dosyasЩ : "
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Imza dosyasЩ : "
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Sources"
-msgstr "Kaynak ekle"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Tip :"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Bilgi yok"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "KullanЩcЩ adЩ :"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "dakika"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"GЖnderdiПin ePostalarda kullanЩlanacak isim ve ePosta adresini belirle. Ve "
-"istersen Эye oldudun ЖrgЭtЭn adЩnЩ ve imza dosyasЩ olarak kullanЩlacak "
-"dosyanЩn adЩnЩ belirtebilirsin."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Tam ismi :"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "ePosta adresi : "
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Imza DosyasЩ"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Sunucu :"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Desteklenen tЭrleri dene ..."
-
-#: 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-gui.c:1130
-#, fuzzy
-msgid "Mail source type:"
-msgstr "ePosta kaynaПЩ"
-
-#: mail/mail-config-gui.c:1135
-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 ""
-"ePosta sunucusunun tЭrЭnЭ seГ ve gerekli bilgileri de verebilirsin. \n"
-"\n"
-"Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
-"basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
-
-#: mail/mail-config-gui.c: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"
-"\n"
-"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"
-"\n"
-"Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
-"basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
-
-#: mail/mail-config-gui.c:1178
-#, fuzzy
-msgid "Mail transport type:"
-msgstr "ePosta transferi"
-
-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-"ePosta sunucusunun tЭrЭnЭ seГ ve gerekli bilgileri de verebilirsin. \n"
-"\n"
-"Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
-"basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Kimlik ekle"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "KimliПi deПiЧtir"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Kaynak ekle"
-
-#: 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-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
+#: mail/mail-config-druid.c:363
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Adres"
-
-#: mail/mail-config.glade.h:10
-#, fuzzy
-msgid "Identities"
-msgstr "Kimlik"
-
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Mail Sources"
-msgstr "ePosta kaynaПЩ"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "ePosta transferi"
-
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
-
-#: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "News Servers"
-msgstr "Haber suncusu ekle"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "News Sources"
-msgstr "Kaynak ekle"
-
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Organization"
-msgstr "жrgЭt : "
-
-#: mail/mail-config.glade.h:18
-#, fuzzy
-msgid "Send messages in HTML format"
-msgstr "ePostayЩ HTML Чeklinde gЖnder"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Diyalog kutusunu yaratamadЩm ."
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -5120,68 +3832,69 @@ msgstr "_AГ ..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 #, fuzzy
 msgid "Hide"
 msgstr "BaЧlЩk"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Eklem ekle"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Cevapla"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Konu dizimini ayЩrtЩrken bir ileti bozuk mu cЩktЩ ?"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Iletiyi gЖnder"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5240,7 +3953,7 @@ msgstr ""
 msgid "Register local folder"
 msgstr "Yeni bir dizini yarat"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5266,164 +3979,164 @@ msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 msgid "Working"
 msgstr "P.t"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "ePosta'yЩ alЩyorum"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "ePosta'yЩ alЩyorum"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "BaЧlЩklar"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Bu iletiyi gЖnder"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 #, fuzzy
 msgid "Moving"
 msgstr "P.t"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 #, fuzzy
 msgid "Copying"
 msgstr "Kopyala"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 #, fuzzy
 msgid "(No description)"
 msgstr "AnlatЩm :"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr ""
 "%s dizinini yaratamadЩm\n"
 " "
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Bir ileti yaz"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Na_sЩl baЧlarЩm"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Bir ileti yaz"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5434,7 +4147,7 @@ msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
 msgid "Cancel"
 msgstr "Iptal"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "TЭnellemeden bozuk bir ileti geldi !"
 
@@ -5539,115 +4252,192 @@ msgstr "_Dizin"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "Iletiyi gЖnderene cevap ver"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "Iletinin yekin alЩcЩlarЩna cevap ver"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "SeГili iletiyi yazdЩr"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Bu iletiyi sil"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 #, fuzzy
 msgid "Unseen"
 msgstr "yedinci"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 #, fuzzy
 msgid "Seen"
 msgstr "GЖnder"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, 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:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%a %b %d %Y"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "Eklem ekle"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "GЖnderen"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "Tarihe gЖre"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "AlЩndЩ"
+
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Gn:"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Boyut"
+
+#: mail/openpgp-utils.c:78
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr ""
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Dizinler"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "SЩrala"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, fuzzy, c-format
 msgid "Getting store for \"%s\""
 msgstr "Na_sЩl baЧlarЩm"
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
@@ -5755,23 +4545,24 @@ msgstr ""
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "( Isimsiz )"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizinlenmende bulunamadЩ."
 
-#: shell/e-shell-view-menu.c:117
+#: 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:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Tel'if hakkЩ (C) 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"
@@ -5781,7 +4572,7 @@ msgstr ""
 "takvim ve tanЩklar yЖnetim uygulamasЩ\n"
 "idir."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Dizinde git ..."
 
@@ -5789,13 +4580,18 @@ msgstr "Dizinde git ..."
 msgid "(No folder displayed)"
 msgstr "( HiГ bir dizin gЖsterilmiyor )"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Dizinler"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5803,80 +4599,90 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kaydЩ kuramadЩm -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Yeni bir tanЩk birimi yarat"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 #, fuzzy
 msgid "Group name:"
 msgstr "Tam ismi :"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 #, fuzzy
 msgid "_Small Icons"
 msgstr "_Ufak ikonalar"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "KЩsayollarЩ ufak ikonalar olarak gЖster"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Large Icons"
 msgstr "_BЭyЭk ikonalar"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "KЩsayollarЩ bЭyЭk ikonalar olarak gЖster"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 #, fuzzy
 msgid "_New Group..."
 msgstr "Yeni ..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Yeni bir tanЩk birimi yarat"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "KЩsayol ГubuПunu gЖsterir"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "KЩ_sayol ГubuПunu gЖster"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "GeГerli yap"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Bu kЩsayolu geГerli yap"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 
@@ -5884,12 +4690,11 @@ msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 msgid "Error saving shortcuts."
 msgstr "KЩsayollarЩ kaydederken hata oldu."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "_GЖster"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 #, fuzzy
 msgid "View the selected folder"
 msgstr "SeГili iletiyi yazdЩr"
@@ -6002,1336 +4807,1886 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parГalar sistemini baЧlatamadЩm."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Yeni bir tanЩk birimi yarat"
+#: ui/evolution-contact-editor.xml:7
+msgid "FIXME: _Appointment"
+msgstr "ABY : _ToplantЩ"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "TanЩПЩ sil"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr "ABY : ToplantЩ is_teПi"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Bul"
+#: ui/evolution-contact-editor.xml:10
+msgid "FIXME: _Mail Message"
+msgstr "ABY : e_Posta iletisi"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Bir tanЩПЩ bul"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "ABY : _TanЩk"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Yeni"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "ABY : _GЖrev"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "TanЩklarЩy azdЩrt"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr "ABY : GЖrev _isteПi"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr ""
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "ABY : GЭ_nlЭk birimi"
+
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr "ABY : _Not"
+
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr "ABY : SeГme _formu ..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr "ABY : _AnЩ stili"
+
+#: ui/evolution-contact-editor.xml:24
 #, fuzzy
-msgid "Stop Loading"
-msgstr "GЖlgeleme"
+msgid "FIXME: Define Print _Styles..."
+msgstr "ABY : YazdЩrma _stilini belirle"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr "ABY : GЖ_nder"
+
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "ABY : Eklem _ekle ..."
+
+#: ui/evolution-contact-editor.xml:38
+msgid "FIXME: _Move to Folder..."
+msgstr "ABY : Dizine _taЧЩ ..."
+
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "ABY : Dizine _kopyala ..."
+
+#: ui/evolution-contact-editor.xml:41
 #, fuzzy
-msgid "View All"
-msgstr "_GЖster"
+msgid "Page Set_up"
+msgstr "Sayfa _kurulumu :"
+
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "ABY : YazdЩrma Жnizlemesi"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-contact-editor.xml:63
 #, fuzzy
-msgid "View all contacts"
-msgstr "Bir tanЩПЩ bul"
+msgid "FIXME: Paste _Special..."
+msgstr "ABY : ж_zel yapЩЧtЩr ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-contact-editor.xml:68
 #, fuzzy
-msgid "_Addressbook Configuration..."
-msgstr "_ePosta ayarlarЩ ..."
+msgid "FIXME: Mark as U_nread"
+msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
+
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "_Nesne"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "ABY : _Birim"
+
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr "ABY : _OkunmamЩЧ birim"
+
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "ABY : Dizindeki _ilk birim"
+
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "ABY : Dizindeki _son birim"
+
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr "ABY : _Vasat"
+
+#: ui/evolution-contact-editor.xml:93
 #, fuzzy
-msgid "_Print Contacts..."
-msgstr "TanЩklarЩy azdЩrt"
+msgid "FIXME: __Formatting"
+msgstr "ABY : __чekillendirme"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr ""
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr "ABY : _жzelleЧtir ..."
+
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "_Geri"
+
+#: ui/evolution-contact-editor.xml:102
+msgid "Ne_xt"
+msgstr "_Ileri"
+
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "_AraГ ГubuklarЩ"
+
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "ABY : _Dosya ..."
+
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "ABY : Bi_rim ..."
+
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "ABY : _Nesne ..."
+
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "ABY : _YazЩ tipi ..."
+
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "ABY : _FЩkra ..."
+
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr "ABY : Bu formu _dЭzenle"
+
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr "ABY : _Bir formu dЭzenle ..."
+
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr "ABY : _Formu aГЩkla ..."
+
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr "ABY : Formu far_klЩ aГikla ..."
+
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "ABY : Denetlem ГЖ_zЭmleyicisi"
+
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "ABY : _Imla ..."
+
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "_чekiller"
+
+#: ui/evolution-contact-editor.xml:142
+msgid "FIXME: _New Contact"
+msgstr "ABY : _Yeni tanЩk"
+
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr "ABY : AynЩ Чi_rketten yeni bir tanЩk"
+
+#: ui/evolution-contact-editor.xml:145
+msgid "FIXME: New _Letter to Contact"
+msgstr "ABY : TanЩПa yeni bir _mektup"
+
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "ABY : TanЩПa yeni bir _mektup"
+
+#: ui/evolution-contact-editor.xml:147
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "ABY : TanЩkla yeni bir t_oplantЩ"
+
+#: ui/evolution-contact-editor.xml:148
+msgid "FIXME: _Plan a Meeting..."
+msgstr "ABY : _Bir toplantЩyЩ tasarЩ et ..."
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
+#: ui/evolution-contact-editor.xml:149
+msgid "FIXME: New _Task for Contact"
+msgstr "ABY : TanЩk iГin yeni bir _gЖrev"
+
+#: ui/evolution-contact-editor.xml:150
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "ABY : TanЩk iГin yeni bir gЭ_nlЭk birimi"
+
+#: ui/evolution-contact-editor.xml:152
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "ABY : I_letme iГin iЧaretle ..."
+
+#: ui/evolution-contact-editor.xml:153
+msgid "FIXME: _Display Map of Address"
+msgstr "ABY : _Adresin haritasЩnЩ gЖster"
+
+#: ui/evolution-contact-editor.xml:154
+msgid "FIXME: _Open Web Page"
+msgstr "ABY : _Websitesini aГ"
+
+#: ui/evolution-contact-editor.xml:156
+msgid "FIXME: Forward as _vCard"
+msgstr "ABY : v_Calendat Чeklinde ilet"
+
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "ABY : _Ilet"
+
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "_IГer"
+
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "чeki_l"
+
+#: ui/evolution-contact-editor.xml:171
 msgid "_Tools"
 msgstr "_гerezler"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 gЭn"
+#: ui/evolution-contact-editor.xml:172
+msgid "Actio_ns"
+msgstr "E_ylemler"
 
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Ayarlar"
+#: ui/evolution-contact-editor.xml:246
+msgid "FIXME: Previous"
+msgstr "ABY : Geri"
 
-#: ui/evolution-calendar.xml.h:8
-#, fuzzy
-msgid "Ca_lendar"
-msgstr "Yeni _takvim"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Gerideki birime git"
+
+#: ui/evolution-contact-editor.xml:249
+msgid "FIXME: Next"
+msgstr "ABY : Ileri"
+
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Ilerideki birime git"
 
-#: ui/evolution-calendar.xml.h:9
+#. 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:2471
 #, fuzzy
-msgid "Calendar Preferences..."
-msgstr "Ayarlar"
+msgid "%A, %B %d, %Y"
+msgstr "%a %b %d %Y"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Yeni bir toplantЩ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "GiriЧimli"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Yeni bir takvimi yarat"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "MesЧgul"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "GЭn"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Ofis'te deПil"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Zamanda geri git"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Bilgi yok"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Zamanda ileri git"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "BaЧkalarЩ _davet et ..."
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Git"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_SeГenekler"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Belirli bir tarihe git"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Sadece Гa_lЩЧma saatleri gЖster"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "чimdiki zamana git"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "_UzaklaЧtЩrЩlmЩЧ gЖster"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "Ay"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "BoЧ/MeЧgul'leri _yenile"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr "Ileri"
+#: 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 "_Otomatikman seГ"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "Bir takvimi aГ"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Geri"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Yekin kiЧiler ve kaynaklar"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Bu takvimi yazdЩrt"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Yekin _kiЧiler ve bir kaynak"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Gerekli kiЧiler"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Gerekli kiЧiler ve _bir kaynak"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "1 gЭnЭ gЖster"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "ToplantЩ baЧlama saati :"
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "1 ayЩ gЖster"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "ToplantЩ bitiЧ saati :"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "2 haftayЩ Жster"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Yekin ziyaretciler"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "гalЩЧma haftasЩnЩ gЖster"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:407
+#, fuzzy
+msgid "Now"
+msgstr "Yeni"
+
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "BugЭn"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Hafta"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "_Yeni"
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
+#: widgets/misc/e-search-bar.c:176
 #, fuzzy
-msgid "_Open Calendar"
-msgstr "_Takvimi aГ"
+msgid "Sear_ch"
+msgstr "Ara ..."
+
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Kitle %i"
 
-#: ui/evolution-calendar.xml.h:34
 #, fuzzy
-msgid "_Print this calendar"
-msgstr "Bu takvimi yazdЩrt"
+#~ msgid "Delete Contact?"
+#~ msgstr "TanЩПЩ sil"
 
-#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save As..."
-msgstr "FarklЩ kaydet ..."
+#~ msgid "Address _2:"
+#~ msgstr "Adres :"
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Bu birimi sil"
+#, fuzzy
+#~ msgid "Check Address"
+#~ msgstr "Adres"
 
-#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
-msgid "Delete..."
-msgstr "Sil"
+#~ msgid "Finland"
+#~ msgstr "Bul"
 
-#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
-msgid "Help"
-msgstr "_Bark"
+#~ msgid "_Address:"
+#~ msgstr "Adres :"
 
-#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
-msgid "Print En_velope..."
-msgstr "YazdЩr ..."
+#~ msgid "_City:"
+#~ msgstr "_DoПum gЭnЭ :"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Bu birimi yazdЩrt"
+#, fuzzy
+#~ msgid "Addressbook Sources"
+#~ msgstr "Kaynak ekle"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "YazdЩr ..."
+#, fuzzy
+#~ msgid "Find..."
+#~ msgstr "Bul"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-msgid "Save _As..."
-msgstr "FarklЩ kaydet ..."
+#~ msgid "Message Recipients"
+#~ msgstr "AlЩcЩlar listesi :"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Kaydet ve kapat"
+#, fuzzy
+#~ msgid "Select Names"
+#~ msgstr "Stil adЩ :"
 
-#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
-msgid "Save the contact and close the dialog box"
-msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
+#~ msgid "Select name from:"
+#~ msgstr "Stil adЩ :"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr ""
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr "YardЩma bak"
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 punto Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 punto Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Sonda boЧ formlar olsun :"
+
+#~ msgid "Body"
+#~ msgstr "IГerik"
+
+#~ msgid "Bottom:"
+#~ msgstr "Alt :"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Ebatlar :"
+
+#~ msgid "Font..."
+#~ msgstr "YazЩ tipi ..."
+
+#~ msgid "Fonts"
+#~ msgstr "YazЩ tipleri"
+
+#~ msgid "Footer:"
+#~ msgstr "Son :"
+
+#~ msgid "Format"
+#~ msgstr "чekil"
+
+#~ msgid "Header"
+#~ msgstr "BaЧlЩk"
+
+#~ msgid "Header/Footer"
+#~ msgstr "BaЧlЩk/son"
+
+#~ msgid "Headings"
+#~ msgstr "BaЧlЩklar"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Her bir mektup iГin ЭstyazЩ"
+
+#~ msgid "Height:"
+#~ msgstr "YЭkseklik :"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "PeЧpeЧe"
+
+#~ msgid "Include:"
+#~ msgstr "IГer :"
+
+#~ msgid "Landscape"
+#~ msgstr "Manzara"
+
+#~ msgid "Left:"
+#~ msgstr "Sol :"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Mektup tab'lerinin tarafa koy"
+
+#~ msgid "Margins"
+#~ msgstr "Kenarlar"
+
+#~ msgid "Number of columns:"
+#~ msgstr "SЭtunlarЩn sayЩsЩ :"
+
+#~ msgid "Options"
+#~ msgstr "SeГenekler"
+
+#~ msgid "Orientation"
+#~ msgstr "Taraflama"
+
+#~ msgid "Page"
+#~ msgstr "Sayfa"
+
+#~ msgid "Paper"
+#~ msgstr "KaПЩt"
+
+#~ msgid "Paper source:"
+#~ msgstr "KaПЩt kaynaПЩ :"
+
+#~ msgid "Portrait"
+#~ msgstr "Portre"
+
+#~ msgid "Preview:"
+#~ msgstr "жnizleme :"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Gri gЖlgelemeyi kullanarak yazdЩrt"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Ikili sayfalarЩ ters Гevir"
+
+#~ msgid "Right:"
+#~ msgstr "SaП :"
+
+#~ msgid "Sections:"
+#~ msgstr "BЖlЭmler :"
+
+#~ msgid "Shading"
+#~ msgstr "GЖlgeleme"
+
+#~ msgid "Size:"
+#~ msgstr "Boyut :"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Yeni bir sayfayla baЧla"
+
+#~ msgid "Style name:"
+#~ msgstr "Stil adЩ :"
+
+#~ msgid "Top:"
+#~ msgstr "эst :"
+
+#~ msgid "Type:"
+#~ msgstr "Tip :"
+
+#~ msgid "Width:"
+#~ msgstr "En :"
+
+#~ msgid "label26"
+#~ msgstr "yafta26"
 
-#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Send _message to contact..."
-msgstr "ABY : TanЩПa yeni bir _ileti"
+#~ msgid "Calendar Server"
+#~ msgstr "Yeni _takvim"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "_Dosya"
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Evolution ГubuПu _kЩsayolu"
 
-#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
-msgid "_Print..."
-msgstr "YazdЩr ..."
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
+
+#~ msgid "Edit appointment"
+#~ msgstr "ToplantЩyЩ deПiЧtir"
+
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Ikaz zamanЩ ( dakika )"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
-msgid "_Save"
-msgstr "_FarklЩ kaydet ..."
+#~ msgid "05 minutes"
+#~ msgstr "dakika"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr ""
+#, fuzzy
+#~ msgid "10 minutes"
+#~ msgstr "dakika"
 
-#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
-msgid "About..."
-msgstr "YazЩ tipi ..."
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 saat (Ж.Ж./Ж.s.)"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Actio_ns"
-msgstr "E_ylemler"
+#, fuzzy
+#~ msgid "15 minutes"
+#~ msgstr "dakika"
 
-#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
-msgid "C_lear"
-msgstr "Araba"
+#~ msgid "24 hour"
+#~ msgstr "24 saat"
 
-#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
-msgid "C_ut"
-msgstr "Kes"
+#~ msgid "30 minutes"
+#~ msgstr "dakika"
 
-#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
-msgid "Clear"
-msgstr "Araba"
+#~ msgid "60 minutes"
+#~ msgstr "dakika"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr ""
+#, fuzzy
+#~ msgid "Alarms timeout after"
+#~ msgstr "Sedai ikazlarЩ kapatma zamanЩ"
 
-#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Bu toplantЩyЩ sil"
+#~ msgid "Calendar"
+#~ msgstr "Yeni _takvim"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Kopyala"
+#, fuzzy
+#~ msgid "Calendar Preferences"
+#~ msgstr "Ayarlar"
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr ""
+#~ msgid "Colors"
+#~ msgstr "Renkler"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Kes"
+#~ msgid "Defaults"
+#~ msgstr "Ince ayarlar"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr ""
+#, fuzzy
+#~ msgid "Display options"
+#~ msgstr "\"YapЩlacak\" stil seГenekleri :"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#, fuzzy
+#~ msgid "Enable snoozing for"
+#~ msgstr "IkazlamayЩ aГ :"
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#, fuzzy
+#~ msgid "Highlight"
+#~ msgstr "жne getirilmiЧ gЭn :"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "ABY : Adres _defteri ..."
+#, fuzzy
+#~ msgid "Items Due Today"
+#~ msgstr "BugЭn zamanЩ dolacak birimleri \"gЖzЖnЭne\" ser"
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
-msgstr "ABY : SeГme _formu ..."
+#, fuzzy
+#~ msgid "Overdue Items"
+#~ msgstr "ZamanЩ geГmiЧ birimleri \"gЖzЖnЭne\" ser"
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
-msgstr "ABY : Isimleri gЖzden g_eГir"
+#, fuzzy
+#~ msgid "Remind me of all appointments"
+#~ msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "ABY : Dizine _kopyala ..."
+#, fuzzy
+#~ msgid "Show week numbers"
+#~ msgstr "2 haftayЩ Жster"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr "ABY : _Bir formu dЭzenle ..."
+#~ msgid "Time Until Due"
+#~ msgstr "GeГmesine kalan zaman"
 
-#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
-msgid "FIXME: Define Print _Styles"
-msgstr "ABY : YazdЩrma _stilini belirle"
+#~ msgid "Time divisions:"
+#~ msgstr "%02i dakika bЖlmeleri"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr "ABY : Bu formu _dЭzenle"
+#, fuzzy
+#~ msgid "Time format:"
+#~ msgstr "Zaman Чekli"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "ABY : Dizindeki _ilk birim"
+#, fuzzy
+#~ msgid "Visual Alarms"
+#~ msgstr "Ikazlar"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "ABY : _Ilet"
+#, fuzzy
+#~ msgid "Work week"
+#~ msgstr "Hafta"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "ABY : v_Calendat Чeklinde ilet"
+#, fuzzy
+#~ msgid "seconds."
+#~ msgstr " saniye"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "ABY : YardЩm"
+#, fuzzy
+#~ msgid "Date Completed:"
+#~ msgstr "Birim anlatЩmЩ :"
 
-#: ui/evolution-event-editor.xml.h:34
 #, fuzzy
-msgid "FIXME: In_complete Task"
-msgstr "ABY : _GЖrev"
+#~ msgid "High"
+#~ msgstr "YЭkseklik :"
 
-#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
-msgid "FIXME: Insert File"
-msgstr "ABY : Dosya iГer ..."
+#~ msgid "Low"
+#~ msgstr "Чimdi"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "ABY : Bi_rim ..."
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "чekil"
 
-#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
-msgid "FIXME: Paste _Special... "
-msgstr "ABY : ж_zel yapЩЧtЩr ..."
+#~ msgid "Task"
+#~ msgstr "GЖrev - %s"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "ABY : YazdЩrma Жnizlemesi"
+#, fuzzy
+#~ msgid "_Contacts..."
+#~ msgstr "_TanЩk ..."
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr "ABY : Formu far_klЩ aГikla ..."
+#, fuzzy
+#~ msgid "_Due Date:"
+#~ msgstr "Bu tarihe kadar :"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr "ABY : _Formu aГЩkla ..."
+#, fuzzy
+#~ msgid "_Priority:"
+#~ msgstr "жnem :"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr "ABY : _Kaynaklar ..."
+#, fuzzy
+#~ msgid "_Status:"
+#~ msgstr "_ZЩpzak :"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr "ABY : GЖ_nder"
+#, fuzzy
+#~ msgid "Appointment Basics"
+#~ msgstr "T_oplantЩlar :"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "ABY : Eklem _ekle ..."
+#, fuzzy
+#~ msgid "Custom recurrence"
+#~ msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "ABY : Denetlem ГЖ_zЭmleyicisi"
+#~ msgid "Days"
+#~ msgstr "GЭn"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr "ABY : GЖrev _isteПi"
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "SeГenekler"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "ABY : _TanЩk"
+#~ msgid "Hours"
+#~ msgstr "Saat"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "ABY : _жzelleЧtir ..."
+#, fuzzy
+#~ msgid "Mail _to:"
+#~ msgstr "ePosta kaynaПЩ"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "ABY : _Dosya ..."
+#~ msgid "Minutes"
+#~ msgstr "Dakika"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "ABY : _YazЩ tipi ..."
+#, fuzzy
+#~ msgid "Modify"
+#~ msgstr "Pazartesi"
 
-#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "ABY : __чekillendirme"
+#~ msgid "No recurrence"
+#~ msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "ABY : _Birim"
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "жnizleme :"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "ABY : GЭ_nlЭk birimi"
+#, fuzzy
+#~ msgid "Pri_vate"
+#~ msgstr "GeГerli yap"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "ABY : Dizindeki _son birim"
+#, fuzzy
+#~ msgid "Recurrence"
+#~ msgstr "ABY : GeliЧler ..."
 
-#: ui/evolution-event-editor.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "ABY : e_Posta iletisi"
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr "ABY : _AnЩ stili"
+#, fuzzy
+#~ msgid "Simple recurrence"
+#~ msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: ui/evolution-event-editor.xml.h:56
-msgid "FIXME: _Move to Folder..."
-msgstr "ABY : Dizine _taЧЩ ..."
+#, fuzzy
+#~ msgid "Su_mmary:"
+#~ msgstr "Toplama :"
 
-#: ui/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "ABY : _Yeni toplantЩ"
+#, fuzzy
+#~ msgid "Time"
+#~ msgstr "Kalan zaman"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "ABY : _Not"
+#, fuzzy
+#~ msgid "_Audio"
+#~ msgstr "_Ekle"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "ABY : _Nesne ..."
+#, fuzzy
+#~ msgid "_Mail"
+#~ msgstr "_Cep"
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "ABY : _FЩkra ..."
+#, fuzzy
+#~ msgid "day(s)"
+#~ msgstr "gЭn"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "ABY : _Imla ..."
+#, fuzzy
+#~ msgid "for"
+#~ msgstr "dЭrdЭncЭ"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr "ABY : _Vasat"
+#, fuzzy
+#~ msgid "label21"
+#~ msgstr "yafta1"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "ABY : _GЖrev"
+#, fuzzy
+#~ msgid "month(s)"
+#~ msgstr "ay"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr "ABY : _OkunmamЩЧ birim"
+#, fuzzy
+#~ msgid "week(s)"
+#~ msgstr "hafta"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#, fuzzy
+#~ msgid "year(s)"
+#~ msgstr "yЩl"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "чeki_l"
+#, fuzzy
+#~ msgid "April"
+#~ msgstr "nisan"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr ""
+#, fuzzy
+#~ msgid "August"
+#~ msgstr "aПustos"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr ""
+#, fuzzy
+#~ msgid "December"
+#~ msgstr "aralЩk"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Ilerideki birime git"
+#, fuzzy
+#~ msgid "February"
+#~ msgstr "Чubat"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Gerideki birime git"
+#, fuzzy
+#~ msgid "Go To Date"
+#~ msgstr "Tarihe git"
 
-#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "\"YapЩlacak\"'lar listesi Жzellikler"
+#~ msgid "Go To Today"
+#~ msgstr "BugЭne git"
 
-#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
-msgid "N_ext"
-msgstr "Ileri"
+#~ msgid "January"
+#~ msgstr "ocak"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "YapЩЧtЩr"
+#, fuzzy
+#~ msgid "July"
+#~ msgstr "temmuz"
 
-#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "Birimi arabellekten yapЩЧtЩr"
+#~ msgid "June"
+#~ msgstr "haziran"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "_Geri"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "mart"
 
-#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "Previous"
-msgstr "_Geri"
+#~ msgid "May"
+#~ msgstr "Pazartesi"
+
+#, fuzzy
+#~ msgid "November"
+#~ msgstr "kasЩm"
 
-#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "YazdЩr ..."
+#~ msgid "October"
+#~ msgstr "ekim"
 
-#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Print Setup"
-msgstr "Sayfa _kurulumu"
+#~ msgid "September"
+#~ msgstr "eylЭl"
+
+#~ msgid "Attachment properties"
+#~ msgstr "Eklem Жzellikleri"
+
+#~ msgid "File name:"
+#~ msgstr "Dosya adЩ :"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME tЭrЭ :"
 
-#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Properties"
-msgstr "жzellikler ..."
+#~ msgid "Edit VFolders"
+#~ msgstr "Filtralarla oyna"
 
-#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
-msgid "Redo"
-msgstr "Radyo"
+#~ msgid "Filter Rules"
+#~ msgstr "Filtra"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr ""
+#, fuzzy
+#~ msgid "Outgoing"
+#~ msgstr "DЩЧlЩm :"
 
-#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
-msgid "Replace"
-msgstr "Cevapla"
+#~ msgid "Virtual Folders"
+#~ msgstr "_Sanal Dizin SihirbazЩ ..."
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr ""
+#, fuzzy
+#~ msgid "vFolder Sources"
+#~ msgstr "Kaynak ekle"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
+#, fuzzy
+#~ msgid "Save"
+#~ msgstr "C.tesi"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
-msgid "Save the current file"
-msgstr "Imza dosyasЩ : "
+#~ msgid "Show all hidden"
+#~ msgstr "Bu sЩralamada gЖster"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "BaЧlЩk"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Sil"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Subject"
+#~ msgstr "Konu"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Dosya bulunamadЩ"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr ""
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Iletiyi gЖnder"
 
-#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
-msgid "Select All"
-msgstr "Hepsine cevapla"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Konu"
 
-#: ui/evolution-event-editor.xml.h:100
-msgid "Select everything"
-msgstr ""
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "чekil"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr ""
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Yeni telefon tipi"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr ""
+#, fuzzy
+#~ msgid "mh"
+#~ msgstr "h"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
-msgid "_About..."
-msgstr "_Evolution bilgisi ..."
+#~ msgid "Account Information"
+#~ msgstr "Bilgi yok"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
-msgid "_Close"
-msgstr "Kapat"
+#~ msgid "Account Properties"
+#~ msgstr "Eklem Жzellikleri"
 
-#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
-msgid "_Copy"
-msgstr "Kopyala"
+#~ msgid "Advanced"
+#~ msgstr "Ekle ..."
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "DoПrulama :"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "_DeПiЧtir"
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "DoПrulama :"
 
-#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
-msgid "_Find..."
-msgstr "Bul"
+#~ msgid "Delete mail from server"
+#~ msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "_чekiller"
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Yok"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "_Bark"
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "ePosta adresi : "
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "_IГer"
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "ePosta adresi : "
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "_Nesne"
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ePosta ayarlamasЩ"
 
-#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
-msgid "_Paste"
-msgstr "YapЩЧtЩr"
+#~ msgid "Full Name:"
+#~ msgstr "Tam ismi :"
 
-#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
-msgid "_Print"
-msgstr "YazdЩr"
+#~ msgid "Hostname:"
+#~ msgstr "KullanЩcЩ adЩ :"
+
+#~ msgid "Identity"
+#~ msgstr "Kimlik"
 
-#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
-msgid "_Properties..."
-msgstr "жzellikler ..."
+#~ msgid "Mail"
+#~ msgstr "_Cep"
 
-#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
-msgid "_Redo"
-msgstr "Radyo"
+#~ msgid "Mail Account"
+#~ msgstr "_Ufak ikonalar"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ePosta ayarlamasЩ"
 
-#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
-msgid "_Replace..."
-msgstr "_AГ ..."
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "ePosta ayarlamasЩ"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "_AraГ ГubuklarЩ"
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "Yeni"
 
-#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
-msgid "_Undo"
-msgstr "_GЖnder"
+#~ msgid "Optional"
+#~ msgstr "SeГenekler"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "Yaz"
+#~ msgid "Organization:"
+#~ msgstr "жrgЭt : "
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Yeni bir ePosta iletisini yaz"
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "_ParolalarЩ unut"
 
-#: ui/evolution-mail.xml.h:9
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "Iletiyi yeni bir dizine taЧЩ"
+#~ msgid "Reply-to:"
+#~ msgstr "Cevapla"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 #, fuzzy
-msgid "F_older"
-msgstr "_Dizin"
+#~ msgid "Required"
+#~ msgstr "_Gerekli kiЧiler"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr ""
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "VCard olarak kaydet"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr ""
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Imza dosyasЩ : "
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "_ParolalarЩ unut"
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "GЖnder"
 
-#: ui/evolution-mail.xml.h:20
 #, fuzzy
-msgid "Get Mail"
-msgstr "ePosta'yЩ al"
+#~ msgid "Server Configuration"
+#~ msgstr "ePosta ayarlamasЩ"
 
-#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "SeГili iletiyi yazdЩr"
+#~ msgid "Server Type: "
+#~ msgstr "Sunucu :"
 
-#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Bu iletiyi ilet"
+#~ msgid "Servers"
+#~ msgstr "Sunucu :"
+
+#~ msgid "Signature file:"
+#~ msgstr "Imza dosyasЩ : "
 
-#: ui/evolution-mail.xml.h:24
 #, fuzzy
-msgid "Hide _Selected messages"
-msgstr "SeГili iletiyi yazdЩr"
+#~ msgid "Signature:"
+#~ msgstr "Imza dosyasЩ : "
 
-#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters..."
-msgstr "ePosta _filtralarЩ ..."
+#~ msgid "Sources"
+#~ msgstr "Kaynak ekle"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "AnlatЩm :"
+#~ msgid "Type"
+#~ msgstr "Tip :"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr ""
+#, fuzzy
+#~ msgid "User Information"
+#~ msgstr "Bilgi yok"
+
+#~ msgid "Username:"
+#~ msgstr "KullanЩcЩ adЩ :"
 
-#: ui/evolution-mail.xml.h:28
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
+#~ msgid "minute(s)"
+#~ msgstr "dakika"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "TaЧЩ"
+#~ 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 ""
+#~ "GЖnderdiПin ePostalarda kullanЩlanacak isim ve ePosta adresini belirle. Ve "
+#~ "istersen Эye oldudun ЖrgЭtЭn adЩnЩ ve imza dosyasЩ olarak kullanЩlacak "
+#~ "dosyanЩn adЩnЩ belirtebilirsin."
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Iletiyi yeni bir dizine taЧЩ"
+#~ msgid "Full name:"
+#~ msgstr "Tam ismi :"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr ""
+#~ msgid "Email address:"
+#~ msgstr "ePosta adresi : "
+
+#~ msgid "Signature File"
+#~ msgstr "Imza DosyasЩ"
+
+#~ msgid "Server:"
+#~ msgstr "Sunucu :"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Desteklenen tЭrleri dene ..."
 
-#: ui/evolution-mail.xml.h:33
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "YazdЩrma Жnizlemesi"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr ""
+#~ msgid "Test Settings"
+#~ msgstr "AyarlarЩ dene"
 
-#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Print message..."
-msgstr "YazdЩr ..."
+#~ msgid "Mail source type:"
+#~ msgstr "ePosta kaynaПЩ"
+
+#~ 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 ""
+#~ "ePosta sunucusunun tЭrЭnЭ seГ ve gerekli bilgileri de verebilirsin. \n"
+#~ "\n"
+#~ "Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
+#~ "basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
 
-#: ui/evolution-mail.xml.h:39
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Hepsine cevapla"
+#~ msgid "News source type:"
+#~ msgstr "Yeni telefon tipi"
+
+#~ 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 ""
+#~ "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 ."
 
-#: ui/evolution-mail.xml.h:40
 #, fuzzy
-msgid "Reply to _Sender"
-msgstr "Hepsine cevapla"
+#~ msgid "Mail transport type:"
+#~ msgstr "ePosta transferi"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-msgid "Select _All"
-msgstr "Hepsine cevapla"
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "ePosta sunucusunun tЭrЭnЭ seГ ve gerekli bilgileri de verebilirsin. \n"
+#~ "\n"
+#~ "Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
+#~ "basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
+#~ msgid "Add Identity"
+#~ msgstr "Kimlik ekle"
+
+#~ msgid "Edit Identity"
+#~ msgstr "KimliПi deПiЧtir"
+
+#~ msgid "Add Source"
+#~ msgstr "Kaynak ekle"
+
+#~ msgid "Edit Source"
+#~ msgstr "KaynaПЩ deПiЧtir"
+
+#~ msgid "Add News Server"
+#~ msgstr "Haber suncusu ekle"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Haber sunucusuyla oyna"
 
-#: ui/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Bu iletiyi ilet"
+#~ msgid "Testing \"%s\""
+#~ msgstr "AyarlarЩ dene"
+
+#~ msgid "Address"
+#~ msgstr "Adres"
 
-#: ui/evolution-mail.xml.h:46
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Iletilerin k_onu listesi"
+#~ msgid "Identities"
+#~ msgstr "Kimlik"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr ""
+#, fuzzy
+#~ msgid "Mail Sources"
+#~ msgstr "ePosta kaynaПЩ"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr ""
+#~ msgid "Mail Transport"
+#~ msgstr "ePosta transferi"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
 
-#: ui/evolution-mail.xml.h:50
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "Filtra"
+#~ msgid "News Servers"
+#~ msgstr "Haber suncusu ekle"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr ""
+#, fuzzy
+#~ msgid "News Sources"
+#~ msgstr "Kaynak ekle"
 
-#: ui/evolution-mail.xml.h:52
 #, fuzzy
-msgid "_Copy to Folder..."
-msgstr "Dizine _git ..."
+#~ msgid "Send messages in HTML format"
+#~ msgstr "ePostayЩ HTML Чeklinde gЖnder"
+
+#~ msgid "Delete a contact"
+#~ msgstr "TanЩПЩ sil"
+
+#~ msgid "Find"
+#~ msgstr "Bul"
+
+#~ msgid "Find a contact"
+#~ msgstr "Bir tanЩПЩ bul"
+
+#~ msgid "Print contacts"
+#~ msgstr "TanЩklarЩy azdЩrt"
 
-#: ui/evolution-mail.xml.h:54
 #, fuzzy
-msgid "_Edit Message"
-msgstr "Iletiyi gЖnder"
+#~ msgid "Stop Loading"
+#~ msgstr "GЖlgeleme"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr "_Temizle"
+#, fuzzy
+#~ msgid "View All"
+#~ msgstr "_GЖster"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "View all contacts"
+#~ msgstr "Bir tanЩПЩ bul"
 
-#: ui/evolution-mail.xml.h:57
 #, fuzzy
-msgid "_Forward"
-msgstr "Ilet"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_ePosta ayarlarЩ ..."
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr ""
+#, fuzzy
+#~ msgid "_Print Contacts..."
+#~ msgstr "TanЩklarЩy azdЩrt"
+
+#~ msgid "5 Days"
+#~ msgstr "5 gЭn"
 
-#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration..."
-msgstr "_ePosta ayarlarЩ ..."
+#~ msgid "Alter preferences"
+#~ msgstr "Ayarlar"
 
-#: ui/evolution-mail.xml.h:60
 #, fuzzy
-msgid "_Message"
-msgstr "Iletiyi kaydet"
+#~ msgid "Ca_lendar"
+#~ msgstr "Yeni _takvim"
 
-#: ui/evolution-mail.xml.h:61
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "ABY : Dizine _taЧЩ ..."
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Ayarlar"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr ""
+#~ msgid "Create a new appointment"
+#~ msgstr "Yeni bir toplantЩ"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Yeni bir takvimi yarat"
+
+#~ msgid "Day"
+#~ msgstr "GЭn"
+
+#~ msgid "Go back in time"
+#~ msgstr "Zamanda geri git"
+
+#~ msgid "Go forward in time"
+#~ msgstr "Zamanda ileri git"
+
+#~ msgid "Go to"
+#~ msgstr "Git"
+
+#~ msgid "Go to a specific date"
+#~ msgstr "Belirli bir tarihe git"
+
+#~ msgid "Go to present time"
+#~ msgstr "чimdiki zamana git"
+
+#~ msgid "Month"
+#~ msgstr "Ay"
+
+#~ msgid "Next"
+#~ msgstr "Ileri"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Bir takvimi aГ"
+
+#~ msgid "Prev"
+#~ msgstr "Geri"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Bu takvimi yazdЩrt"
+
+#~ msgid "Show 1 day"
+#~ msgstr "1 gЭnЭ gЖster"
+
+#~ msgid "Show 1 month"
+#~ msgstr "1 ayЩ gЖster"
+
+#~ msgid "Show 1 week"
+#~ msgstr "2 haftayЩ Жster"
+
+#~ msgid "Show the working week"
+#~ msgstr "гalЩЧma haftasЩnЩ gЖster"
+
+#~ msgid "Week"
+#~ msgstr "Hafta"
+
+#~ msgid "_New"
+#~ msgstr "_Yeni"
 
-#: ui/evolution-mail.xml.h:63
 #, fuzzy
-msgid "_Print Message"
-msgstr "Iletiyi gЖnder"
+#~ msgid "_Open Calendar"
+#~ msgstr "_Takvimi aГ"
 
-#: ui/evolution-mail.xml.h:64
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "_FarklЩ kaydet ..."
+#~ msgid "_Print this calendar"
+#~ msgstr "Bu takvimi yazdЩrt"
 
-#: ui/evolution-mail.xml.h:65
 #, fuzzy
-msgid "_Source"
-msgstr "Kaynak ekle"
+#~ msgid "_Save As..."
+#~ msgstr "FarklЩ kaydet ..."
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#~ msgid "Delete this item"
+#~ msgstr "Bu birimi sil"
 
-#: ui/evolution-mail.xml.h:67
 #, fuzzy
-msgid "_Undelete"
-msgstr "_Sil"
+#~ msgid "Delete..."
+#~ msgstr "Sil"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr ""
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "_Bark"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "_Sanal Dizin SihirbazЩ ..."
+#~ msgid "Print En_velope..."
+#~ msgstr "YazdЩr ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Ekle"
+#~ msgid "Print this item"
+#~ msgstr "Bu birimi yazdЩrt"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr ""
+#~ msgid "Print..."
+#~ msgstr "YazdЩr ..."
 
-#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Iletiyi gЖnder"
+#~ msgid "Save _As..."
+#~ msgstr "FarklЩ kaydet ..."
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Save and Close"
+#~ msgstr "Kaydet ve kapat"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Bir dosyayЩ metin olarak ekle"
+#, fuzzy
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
+
+#~ msgid "See online help"
+#~ msgstr "YardЩma bak"
 
-#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-msgid "Insert text file..."
-msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+#~ msgid "Send _message to contact..."
+#~ msgstr "ABY : TanЩПa yeni bir _ileti"
+
+#~ msgid "_File"
+#~ msgstr "_Dosya"
 
-#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Open a file"
-msgstr "DosyayЩ aГ"
+#~ msgid "_Print..."
+#~ msgstr "YazdЩr ..."
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr ""
+#, fuzzy
+#~ msgid "_Save"
+#~ msgstr "_FarklЩ kaydet ..."
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr ""
+#, fuzzy
+#~ msgid "About..."
+#~ msgstr "YazЩ tipi ..."
 
-#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save As"
-msgstr "FarklЩ kaydet ..."
+#~ msgid "C_lear"
+#~ msgstr "Araba"
 
-#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "_Dizinde kaydet ..."
+#~ msgid "C_ut"
+#~ msgstr "Kes"
 
-#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "Save in folder..."
-msgstr "_Dizinde kaydet ..."
+#~ msgid "Clear"
+#~ msgstr "Araba"
 
-#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-msgid "Save the current file with a different name"
-msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+#~ msgid "Close this appointment"
+#~ msgstr "Bu toplantЩyЩ sil"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Iletiyi belirlenen dizinde kaydet"
+#~ msgid "Copy"
+#~ msgstr "Kopyala"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "GЖnder"
+#~ msgid "Cut"
+#~ msgstr "Kes"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "ABY : Adres _defteri ..."
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "ABY : Isimleri gЖzden g_eГir"
+
+#~ msgid "FIXME: Forward as v_Calendar"
+#~ msgstr "ABY : v_Calendat Чeklinde ilet"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "ePostayЩ HTML Чeklinde gЖnder"
+#~ msgid "FIXME: Help"
+#~ msgstr "ABY : YardЩm"
 
-#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-msgid "Send the message later"
-msgstr "Iletiyi gЖnder"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "ABY : _GЖrev"
 
-#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-msgid "Send the message now"
-msgstr "Iletiyi gЖnder"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "ABY : Dosya iГer ..."
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "ABY : _Kaynaklar ..."
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "ABY : _Yeni toplantЩ"
 
-#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-msgid "Send this message now"
-msgstr "Bu iletiyi gЖnder"
+#~ msgid "Modify the file's properties"
+#~ msgstr "\"YapЩlacak\"'lar listesi Жzellikler"
 
-#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-msgid "Show / hide attachments"
-msgstr "Eklemleri gЖster/gizle"
+#~ msgid "N_ext"
+#~ msgstr "Ileri"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "_Eklemleri gЖster"
+#~ msgid "Paste"
+#~ msgstr "YapЩЧtЩr"
 
-#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-msgid "Show attachments"
-msgstr "_Eklemleri gЖster"
+#~ msgid "Paste the clipboard"
+#~ msgstr "Birimi arabellekten yapЩЧtЩr"
 
-#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-msgid "Sign this message with your PGP key"
-msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+#~ msgid "Previous"
+#~ msgstr "_Geri"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "YazdЩr ..."
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_AГ ..."
+#, fuzzy
+#~ msgid "Print Setup"
+#~ msgstr "Sayfa _kurulumu"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "жzellikler ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Radyo"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr ""
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Cevapla"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr ""
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#, fuzzy
+#~ msgid "Save the current file"
+#~ msgstr "Imza dosyasЩ : "
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "Hepsine cevapla"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "_Evolution bilgisi ..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "DeПiЧik bir dizini gЖster"
+#, fuzzy
+#~ msgid "_Close"
+#~ msgstr "Kapat"
 
-#: ui/evolution.xml.h:7
 #, fuzzy
-msgid "E_xit"
-msgstr "гЩ_k ..."
+#~ msgid "_Copy"
+#~ msgstr "Kopyala"
 
-#: ui/evolution.xml.h:8
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ГubuПu _kЩsayolu"
+#~ msgid "_Edit"
+#~ msgstr "_DeПiЧtir"
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr ""
+#, fuzzy
+#~ msgid "_Find..."
+#~ msgstr "Bul"
+
+#~ msgid "_Help"
+#~ msgstr "_Bark"
 
-#: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Na_sЩl baЧlarЩm"
+#~ msgid "_Paste"
+#~ msgstr "YapЩЧtЩr"
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Evolution hakkЩnda bilgi gЖster"
+#, fuzzy
+#~ msgid "_Print"
+#~ msgstr "YazdЩr"
 
-#: ui/evolution.xml.h:12
 #, fuzzy
-msgid "Show the _Folder Bar"
-msgstr "Dizinler ГubuПunu gЖsterir"
+#~ msgid "_Properties..."
+#~ msgstr "жzellikler ..."
 
-#: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "KЩsayol ГubuПunu gЖsterir"
+#~ msgid "_Redo"
+#~ msgstr "Radyo"
 
-#: ui/evolution.xml.h:14
 #, fuzzy
-msgid "Submit _Bug Report"
-msgstr "_Hata raporunu gЖnder"
+#~ msgid "_Replace..."
+#~ msgstr "_AГ ..."
 
-#: ui/evolution.xml.h:15
 #, fuzzy
-msgid "Submit bug report using Bug Buddy."
-msgstr "bug-buddy desteПiyle bir hata raporunu gЖnder"
+#~ msgid "_Undo"
+#~ msgstr "_GЖnder"
+
+#~ msgid "Compose"
+#~ msgstr "Yaz"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Yeni bir ePosta iletisini yaz"
 
-#: ui/evolution.xml.h:16
 #, fuzzy
-msgid "Toggle whether to show the folder bar"
-msgstr "Dizinler ГubuПunu gЖsterir"
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
 
-#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Toggle whether to show the shortcut bar"
-msgstr "KЩsayol ГubuПunu gЖsterir"
+#~ msgid "F_older"
+#~ msgstr "_Dizin"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "_ParolalarЩ unut"
 
-#: ui/evolution.xml.h:18
 #, fuzzy
-msgid "Using the C_ontact Manager"
-msgstr "Ta_nЩklar yЖneticisini nasЩl kullanЩrЩm"
+#~ msgid "Get Mail"
+#~ msgstr "ePosta'yЩ al"
 
-#: ui/evolution.xml.h:19
 #, fuzzy
-msgid "Using the _Calendar"
-msgstr "_Takvimi nasЩl kullanЩrЩm"
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "SeГili iletiyi yazdЩr"
 
-#: ui/evolution.xml.h:20
 #, fuzzy
-msgid "Using the _Mailer"
-msgstr "_ePosta bЖlЭmЭnЭ nasЩl kullanЩrЩm"
+#~ msgid "Hide _Read messages"
+#~ msgstr "Bu iletiyi ilet"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "_Evolution bilgisi ..."
+#, fuzzy
+#~ msgid "Hide _Selected messages"
+#~ msgstr "SeГili iletiyi yazdЩr"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "T_oplantЩ"
+#, fuzzy
+#~ msgid "Mail _Filters..."
+#~ msgstr "ePosta _filtralarЩ ..."
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "_TanЩk"
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "AnlatЩm :"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "_Dizin"
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
+
+#~ msgid "Move"
+#~ msgstr "TaЧЩ"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
 
-#: ui/evolution.xml.h:27
 #, fuzzy
-msgid "_Go to Folder..."
-msgstr "Dizine _git ..."
+#~ msgid "Print Preview of message..."
+#~ msgstr "YazdЩrma Жnizlemesi"
 
-#: ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Index"
-msgstr "_IГer"
+#~ msgid "Print message..."
+#~ msgstr "YazdЩr ..."
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "e_Posta iletisi"
+#, fuzzy
+#~ msgid "Reply to _All"
+#~ msgstr "Hepsine cevapla"
 
-#: ui/evolution.xml.h:32
 #, fuzzy
-msgid "_Settings"
-msgstr "AyarlarЩ dene"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Hepsine cevapla"
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "_GЖrev"
+#, fuzzy
+#~ msgid "Select _All"
+#~ msgstr "Hepsine cevapla"
 
-#. 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:2471
 #, fuzzy
-msgid "%A, %B %d, %Y"
-msgstr "%a %b %d %Y"
+#~ msgid "Show _All messages"
+#~ msgstr "Bu iletiyi ilet"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "GiriЧimli"
+#, fuzzy
+#~ msgid "Threaded Message list"
+#~ msgstr "Iletilerin k_onu listesi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "MesЧgul"
+#, fuzzy
+#~ msgid "_Apply Filters"
+#~ msgstr "Filtra"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ofis'te deПil"
+#, fuzzy
+#~ msgid "_Copy to Folder..."
+#~ msgstr "Dizine _git ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Bilgi yok"
+#, fuzzy
+#~ msgid "_Edit Message"
+#~ msgstr "Iletiyi gЖnder"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "BaЧkalarЩ _davet et ..."
+#~ msgid "_Expunge"
+#~ msgstr "_Temizle"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_SeГenekler"
+#, fuzzy
+#~ msgid "_Forward"
+#~ msgstr "Ilet"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Sadece Гa_lЩЧma saatleri gЖster"
+#, fuzzy
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_ePosta ayarlarЩ ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "_UzaklaЧtЩrЩlmЩЧ gЖster"
+#, fuzzy
+#~ msgid "_Message"
+#~ msgstr "Iletiyi kaydet"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "BoЧ/MeЧgul'leri _yenile"
+#, fuzzy
+#~ msgid "_Move to Folder..."
+#~ msgstr "ABY : Dizine _taЧЩ ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "Iletiyi gЖnder"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Otomatikman seГ"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "_FarklЩ kaydet ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Kaynak ekle"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Yekin kiЧiler ve kaynaklar"
+#, fuzzy
+#~ msgid "_Undelete"
+#~ msgstr "_Sil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Yekin _kiЧiler ve bir kaynak"
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "_Sanal Dizin SihirbazЩ ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_Gerekli kiЧiler"
+#~ msgid "Attach"
+#~ msgstr "Ekle"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Gerekli kiЧiler ve _bir kaynak"
+#, fuzzy
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Iletiyi gЖnder"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "ToplantЩ baЧlama saati :"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "ToplantЩ bitiЧ saati :"
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Bir dosyayЩ metin olarak ekle"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Yekin ziyaretciler"
+#, fuzzy
+#~ msgid "Insert text file..."
+#~ msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr ""
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "DosyayЩ aГ"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr ""
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "FarklЩ kaydet ..."
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "_Dizinde kaydet ..."
 
-#: widgets/misc/e-dateedit.c:407
 #, fuzzy
-msgid "Now"
-msgstr "Yeni"
+#~ msgid "Save in folder..."
+#~ msgstr "_Dizinde kaydet ..."
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#, fuzzy
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Iletiyi belirlenen dizinde kaydet"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Kitle %i"
+#~ msgid "Send"
+#~ msgstr "GЖnder"
 
-#~ msgid "categories"
-#~ msgstr "tЭrler"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "ePostayЩ HTML Чeklinde gЖnder"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Iletiyi gЖnder"
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Iletiyi gЖnder"
+
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Bu iletiyi gЖnder"
+
+#, fuzzy
+#~ msgid "Show / hide attachments"
+#~ msgstr "Eklemleri gЖster/gizle"
+
+#~ msgid "Show _attachments"
+#~ msgstr "_Eklemleri gЖster"
+
+#, fuzzy
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+
+#~ msgid "_Open..."
+#~ msgstr "_AГ ..."
+
+#~ msgid "Display a different folder"
+#~ msgstr "DeПiЧik bir dizini gЖster"
+
+#, fuzzy
+#~ msgid "E_xit"
+#~ msgstr "гЩ_k ..."
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ГubuПu _kЩsayolu"
+
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Na_sЩl baЧlarЩm"
+
+#~ msgid "Show information about Evolution"
+#~ msgstr "Evolution hakkЩnda bilgi gЖster"
+
+#, fuzzy
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Dizinler ГubuПunu gЖsterir"
+
+#, fuzzy
+#~ msgid "Submit _Bug Report"
+#~ msgstr "_Hata raporunu gЖnder"
+
+#, fuzzy
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "bug-buddy desteПiyle bir hata raporunu gЖnder"
+
+#, fuzzy
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Dizinler ГubuПunu gЖsterir"
+
+#, fuzzy
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "KЩsayol ГubuПunu gЖsterir"
+
+#, fuzzy
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Ta_nЩklar yЖneticisini nasЩl kullanЩrЩm"
+
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Takvimi nasЩl kullanЩrЩm"
+
+#, fuzzy
+#~ msgid "Using the _Mailer"
+#~ msgstr "_ePosta bЖlЭmЭnЭ nasЩl kullanЩrЩm"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_Evolution bilgisi ..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "T_oplantЩ"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_TanЩk"
+
+#~ msgid "_Folder"
+#~ msgstr "_Dizin"
+
+#, fuzzy
+#~ msgid "_Go to Folder..."
+#~ msgstr "Dizine _git ..."
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "_IГer"
+
+#~ msgid "_Mail message (FIXME)"
+#~ msgstr "e_Posta iletisi"
+
+#, fuzzy
+#~ msgid "_Settings"
+#~ msgstr "AyarlarЩ dene"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_GЖrev"
 
 #~ msgid "Item(s) belong to these categories:"
 #~ msgstr "Bu tЭrlere ait olan birimler :"
@@ -7547,57 +6902,9 @@ msgstr "Kitle %i"
 #~ msgid "_Mail Configuration"
 #~ msgstr "ePosta ayarlamasЩ"
 
-#~ 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 "window2"
 #~ msgstr "pencere2"
 
@@ -7789,18 +7096,9 @@ msgstr "Kitle %i"
 #~ 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"
 
@@ -7868,6 +7166,3 @@ msgstr "Kitle %i"
 
 #~ msgid "Refile"
 #~ msgstr "Yeniden dosyala"
-
-#~ msgid "Mail Component: I could not initialize Bonobo"
-#~ msgstr "ePosta parГasЩ : Bonobo'yu baЧlatamadЩm"
diff --git a/po/uk.po b/po/uk.po
index 62311c17dc..de6f0cec5a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
+"POT-Creation-Date: 2001-01-17 18:47-0500\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"
@@ -14,11 +14,183 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: 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:1090
+#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/widgets/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+msgid "Could not initialize Bonobo"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: addressbook/gui/widgets/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/widgets/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-folder.c:604
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Переслати це пов╕домлення"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:63
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Отримання пошти з %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:67
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Закрити"
+
+#: executive-summary/component/e-summary-url.c:68
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Перенести в теку"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Перейти до попереднього елементу"
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Перейти до наступного елементу"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Конф╕╜урувати теку"
+
+#: executive-summary/component/e-summary.c:919
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Неможливо в╕дкрити файл %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Помилка зчитування файлу пошти: %s"
+
+#: executive-summary/component/e-summary.c:951
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+#, fuzzy
+msgid "Error"
+msgstr "Без помилок"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr ""
+
+#: mail/mail-config.c:801
+#, fuzzy
+msgid "Connect to server"
+msgstr "Створити новий календар"
+
+#: notes/component-factory.c:27
+msgid "New"
+msgstr "Новий"
+
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Створити новий контакт"
+
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Картка: "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +198,7 @@ msgstr ""
 "\n"
 "╤м'я: "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,31 +206,31 @@ msgstr ""
 "\n"
 "  Преф╕кс:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -66,7 +238,7 @@ msgstr ""
 "\n"
 "Дата народження: "
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -74,7 +246,7 @@ msgstr ""
 "\n"
 "Адреса:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -82,13 +254,13 @@ msgstr ""
 "\n"
 "  Поштова скринька: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -96,7 +268,7 @@ msgstr ""
 "\n"
 "  Вулиця:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -104,7 +276,7 @@ msgstr ""
 "\n"
 "  М╕сто:       "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -112,7 +284,7 @@ msgstr ""
 "\n"
 "  Ре╜╕он:      "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -120,7 +292,7 @@ msgstr ""
 "\n"
 "  ╤ндекс:      "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -128,13 +300,13 @@ msgstr ""
 "\n"
 "  Кра╖на:      "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -142,7 +314,7 @@ msgstr ""
 "\n"
 "Телефони:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -150,7 +322,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -158,7 +330,7 @@ msgstr ""
 "\n"
 "Електронна пошта:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -166,7 +338,7 @@ msgstr ""
 "\n"
 "Електронна адреса: "
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -174,7 +346,7 @@ msgstr ""
 "\n"
 "Поштова програма: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -182,7 +354,7 @@ msgstr ""
 "\n"
 "Часовий пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -190,7 +362,7 @@ msgstr ""
 "\n"
 "Розташування: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -198,7 +370,7 @@ msgstr ""
 "\n"
 "Помада: "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -206,7 +378,7 @@ msgstr ""
 "\n"
 "Орган╕зац╕я: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -214,31 +386,31 @@ msgstr ""
 "\n"
 "  ╤м'я:  "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -246,7 +418,7 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -264,13 +436,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -278,17 +450,6 @@ msgstr ""
 "\n"
 "Публ╕чний ключ: "
 
-#: 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:1083
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
-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.
@@ -404,40 +565,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:729
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Не вдалося запустити сервер Wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Не вдалось запустити Wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/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.
@@ -447,7 +600,7 @@ msgid "_Add"
 msgstr "Додати"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: ui/evolution-contact-editor.xml:37
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -460,14 +613,7 @@ msgstr "Типи телефон╕в"
 msgid "New phone type"
 msgstr "Новий тип телефона"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Додати"
 
@@ -525,7 +671,6 @@ msgid "C_ontacts..."
 msgstr "Зв'язки..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
@@ -542,8 +687,6 @@ msgid "_Address..."
 msgstr "Адреса..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Загальне"
 
@@ -588,24 +731,27 @@ msgid "No_tes:"
 msgstr "Нотатки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Подробиц╕"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Пом╕чник"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Робоча"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Робоча 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Робочий факс"
 
@@ -614,6 +760,7 @@ msgid "Callback"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Авто"
 
@@ -623,28 +770,33 @@ msgstr "Компан╕я"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Домашня"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Домашня 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Моб╕льний"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "╤нша"
 
@@ -653,10 +805,12 @@ msgid "Other Fax"
 msgstr "╤нший факс"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Пейджер"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Первинний"
 
@@ -673,62 +827,16 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "Address _2:"
-msgstr "Адреса _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "Canada"
-msgstr "Канада"
-
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "Check Address"
-msgstr "Перев╕рка адреси"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "Countr_y:"
-msgstr "Кра╖на:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "Finland"
-msgstr "Ф╕нлянд╕я"
-
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "USA"
-msgstr "США"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_Address:"
-msgstr "Адреса:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "_City:"
-msgstr "М╕сто:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "_PO Box:"
-msgstr "А/С:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "_State/Province:"
-msgstr "Штат/область:"
-
-#: addressbook/contact-editor/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.
@@ -787,12 +895,7 @@ msgstr ""
 msgid "As _Minicards"
 msgstr "Як _Minicards"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
@@ -817,27 +920,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Показати все"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Додатково..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Будь-яке поле м╕стить"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "╤м'я м╕стить"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "Електронна адреса м╕стить"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
@@ -866,9 +969,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Пароль"
 
@@ -904,12 +1007,10 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Запам'ятати цей пароль"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
 #, fuzzy
 msgid "Host:"
 msgstr "Години"
@@ -929,12 +1030,10 @@ msgid "Search Scope:"
 msgstr "Пошук"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Аутенф╕кац╕я:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Шлях:"
 
@@ -960,7 +1059,6 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
 #, fuzzy
 msgid "Name:"
 msgstr ""
@@ -968,190 +1066,88 @@ msgstr ""
 "╤м'я: "
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Опис:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Додати джерело"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
-msgid "Delete"
-msgstr "Стерти"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Пошук"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Виправити"
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
+msgid "Save as VCard"
+msgstr "Зберегти як VCard"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 #, fuzzy
 msgid "Name"
 msgstr ""
 "\n"
 "╤м'я: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "URI"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Find..."
-msgstr "Шукати..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Select Names"
-msgstr "Вибрати назви"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:566
 #, fuzzy
-msgid "Select name from:"
-msgstr "Вибер╕ть назву з списку:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Пошук"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "n"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "o"
-msgstr ""
+msgid "Email"
+msgstr "Е-пошта 2"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "p"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Орган╕зац╕я"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "q"
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "r"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "В╕дд╕л:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "s"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "Оф╕с:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "t"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "Титул:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "u"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "Профес╕я:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "v"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Пейджер"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "w"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "Пр╕звисько:"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "x"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "Джерело"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "y"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Нема╓"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Зберегти як VCard"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Зберегти у адресн╕й книз╕"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1160,179 +1156,6 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/printing/e-contact-print.glade.h:6
-msgid "10 pt. Tahoma"
-msgstr "Tahoma 10 пт"
-
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "8 pt. Tahoma"
-msgstr "Tahoma 8 пт"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Blank forms at end:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Body"
-msgstr "Т╕ло"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Bottom:"
-msgstr "Внизу:"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Dimensions:"
-msgstr "Розм╕ри:"
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Font..."
-msgstr "Шрифт..."
-
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Fonts"
-msgstr "Шрифти"
-
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Footer:"
-msgstr "Нижн╕й колонтитул:"
-
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Format"
-msgstr "Формат"
-
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Header"
-msgstr "Верхн╕й колонтитул"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Header/Footer"
-msgstr "Колонтитули"
-
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Headings"
-msgstr "Верхн╕ колонтитули"
-
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Headings for each letter"
-msgstr "Верхн╕ колонтитули для кожного листа"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-msgid "Height:"
-msgstr "Висота:"
-
-#: addressbook/printing/e-contact-print.glade.h:21
-msgid "Immediately follow each other"
-msgstr "Один за другим"
-
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Include:"
-msgstr "Включити:"
-
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "Landscape"
-msgstr "Альбомна"
-
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Left:"
-msgstr "Л╕воруч:"
-
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "Letter tabs on side"
-msgstr "Закладки л╕тер збоку"
-
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Margins"
-msgstr "Поля"
-
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Number of columns:"
-msgstr "К╕льк╕сть стовпчик╕в:"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Options"
-msgstr "Параметри"
-
-#: addressbook/printing/e-contact-print.glade.h:29
-msgid "Orientation"
-msgstr "Ор╕╓нтац╕я"
-
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Page"
-msgstr "Стор╕нка"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-msgid "Page Setup:"
-msgstr "Параметри стор╕нки:"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-msgid "Paper"
-msgstr "Пап╕р"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-msgid "Paper source:"
-msgstr "Джерело паперу:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-msgid "Portrait"
-msgstr "Книжна"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Preview:"
-msgstr "Перегляд:"
-
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Print using gray shading"
-msgstr "Друк з використанням нап╕втон╕в"
-
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Reverse on even pages"
-msgstr "Обертати на парних стор╕нках"
-
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Right:"
-msgstr "Праворуч:"
-
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Sections:"
-msgstr "Розд╕ли:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Shading"
-msgstr "П╕втони"
-
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Size:"
-msgstr "Розм╕р:"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Start on a new page"
-msgstr "Починати з ново╖ стор╕нки"
-
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "Style name:"
-msgstr "Назва стилю:"
-
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Top:"
-msgstr "Вгор╕:"
-
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
-msgid "Type:"
-msgstr "Тип:"
-
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Width:"
-msgstr "Ширина:"
-
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "label26"
-msgstr "label26"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Канал календаря Evolution"
@@ -1341,13 +1164,13 @@ msgstr "Канал календаря Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:784
+#: calendar/conduits/calendar/calendar-conduit.c:787
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1359,72 +1182,17 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Календар"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Канал календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876
 msgid "Snooze"
 msgstr "Сон"
 
@@ -1434,25 +1202,25 @@ msgstr "Сон"
 msgid "Ok"
 msgstr "Гаразд"
 
-#: calendar/gui/calendar-commands.c:229
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Файлу не знайдено"
 
-#: calendar/gui/calendar-commands.c:253
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "В╕дкрити календар"
 
-#: calendar/gui/calendar-commands.c:295
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Зберегти календар"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:448
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1460,60 +1228,57 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:374
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:377
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:380
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Прозорий"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Непрозорий"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1525,7 +1290,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1533,27 +1298,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:893
 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:868
+#: calendar/gui/calendar-model.c:896
 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:872
+#: calendar/gui/calendar-model.c:900
 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:875
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1563,838 +1328,412 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1063
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Значення пр╕оритету ма╓ бути м╕ж 1 та 9, включно"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:97
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:302
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Помилка завантаження файлу: %s"
 
-#: calendar/gui/calendar-summary.c:229
-msgid "<b>Error loading calendar:<br>Calendar in use."
-msgstr ""
-
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:314
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:484
+#, fuzzy
+msgid "Display"
+msgstr "День"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show appointments"
+msgstr "Показати час завершення зустр╕чей"
+
+#: calendar/gui/calendar-summary.c:497
+#, fuzzy
+msgid "Show tasks"
+msgstr "Показати долучення"
+
+#: calendar/gui/calendar-summary.c:583
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, який в╕добразить календар"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
-msgid "Close"
-msgstr "Закрити"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Edit appointment"
-msgstr "Виправити зустр╕ч"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Snooze time (minutes)"
-msgstr "Час сну (в хвилинах)"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "05 minutes"
-msgstr "05 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "10 minutes"
-msgstr "10 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "12 hour (am/pm)"
-msgstr "12 годин (дп/пп)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "15 minutes"
-msgstr "15 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "24 hour"
-msgstr "24 години"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "30 minutes"
-msgstr "30 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "60 minutes"
-msgstr "60 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Audio Alarms"
-msgstr "Звуков╕ си╜нали"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Colors"
-msgstr "Кольори"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Compress weekends"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Date navigator options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Defaults"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Display options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "К╕нець дня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "First day of week:"
-msgstr "Перший день тижня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Птн"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
-msgid "Friday"
-msgstr "П'ятниця"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Пнд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
-msgid "Monday"
-msgstr "Понед╕лок"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Overdue Items:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Pick a color"
-msgstr "Виб╕р кольору"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
-msgid "Priority"
-msgstr "Пр╕оритет"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Remind me of all appointments"
-msgstr "Нагадувати про вс╕ зустр╕ч╕"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Reminders"
-msgstr "Нагадування"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Сбт"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
-msgid "Saturday"
-msgstr "Субота"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Show"
-msgstr "Показати"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Show appointment end times"
-msgstr "Показати час завершення зустр╕чей"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show week numbers"
-msgstr "Показати номера тижн╕в"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Start of day:"
-msgstr "Початок дня:"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Ндл"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
-msgid "Sunday"
-msgstr "Нед╕ля"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "TaskPad"
-msgstr "Панель завдань"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Чтв"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
-msgid "Thursday"
-msgstr "Четвер"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Time Until Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Time divisions:"
-msgstr "Розд╕лювач╕ часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Time format:"
-msgstr "Формат часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Втр"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
-msgid "Tuesday"
-msgstr "В╕второк"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Срд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
-msgid "Wednesday"
-msgstr "Середа"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Work week"
-msgstr "Робочий тиждень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "minutes before they occur."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "seconds."
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:62
+#: calendar/gui/dialogs/delete-comp.c:63
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: calendar/gui/dialogs/delete-comp.c:65
+#: calendar/gui/dialogs/delete-comp.c:66
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:72
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти завдання"
 
-#: calendar/gui/dialogs/delete-comp.c:74
+#: calendar/gui/dialogs/delete-comp.c:75
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ви впевнен╕, що хочете стерти завдання"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:81
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕"
 
-#: calendar/gui/dialogs/delete-comp.c:83
+#: calendar/gui/dialogs/delete-comp.c:84
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "% Comp_lete:"
-msgstr "% завершення:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "Класиф╕кац╕я:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Cancelled"
-msgstr "В╕дм╕нено"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Completed"
-msgstr "Завершено"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Date Completed:"
-msgstr "Дата виконання:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "High"
-msgstr "Високий"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "In Progress"
-msgstr "Викону╓ться"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Low"
-msgstr "Низький"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Нема╓"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Звичайний"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Not Started"
-msgstr "Не розпочато"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "Sta_rt Date:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "Task"
-msgstr "Завдання"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "Контакти..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Due Date:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "_Priority:"
-msgstr "Пр╕оритет:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "_Status:"
-msgstr "Стан:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "task-editor-dialog"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Виправити завдання"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустр╕ч - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
 msgid "Do you want to save changes?"
 msgstr "Ви хочете зм╕нити зм╕ни?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:154
+#, fuzzy
+msgid "Categories"
+msgstr "категор╕╖"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Classification"
+msgstr "Класиф╕кац╕я"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "Completion Date"
+msgstr "Завершено"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "End Date"
+msgstr "Час завершення:"
+
+#: calendar/gui/e-calendar-table.c:158
+#, fuzzy
+msgid "Start Date"
+msgstr "Час початку:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:161
+#, fuzzy
+msgid "Precent complete"
+msgstr "Позначити завдання як виконане"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Priority"
+msgstr "Пр╕оритет"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Summary"
+msgstr "Нед╕ля"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "Transparency"
+msgstr "Прозорий"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:166
+#, fuzzy
+msgid "Alarms"
+msgstr "Звуков╕ си╜нали"
+
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "В╕дкрити..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "В╕дкрити завдання"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Позначити завдання як виконане"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+msgid "Delete"
+msgstr "Стерти"
+
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Стерти завдання"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:1211
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-week-view-main-item.c:321
 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:1225
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-week-view-main-item.c:330
 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:1238
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
 #: calendar/gui/print.c:610
 msgid "am"
 msgstr "дп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
 #: calendar/gui/print.c:609
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
+#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
+#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
 msgid "New appointment..."
 msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
+#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
 msgid "Edit this appointment..."
 msgstr "Виправити зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
 msgid "Delete this appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 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 "%d %B"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "A_ll day event"
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Appointment Basics"
-msgstr "П╕дстави зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Класиф╕кац╕я"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Custom recurrence"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Days"
-msgstr "Дн╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Exceptions"
-msgstr "Виключення"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Hours"
-msgstr "Години"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Mail _to:"
-msgstr "Лист до:"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Minutes"
-msgstr "Хвилини"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Modify"
-msgstr "Зм╕нити"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "No recurrence"
-msgstr "Без повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Preview"
-msgstr "Перегляд"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Pri_vate"
-msgstr "Особисте"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Pu_blic"
-msgstr "Публ╕чне"
-
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Recurrence"
-msgstr "Повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Recurrence Rule"
-msgstr "Правило повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Reminder"
-msgstr "Нагадування"
-
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Simple recurrence"
-msgstr "Просте повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Su_mmary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Time"
-msgstr "Час"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Audio"
-msgstr "Ауд╕о"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_End time:"
-msgstr "Час завершення:"
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Mail"
-msgstr "Пошта"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Program"
-msgstr "Програма"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr "Запустити програму:"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Start time:"
-msgstr "Час початку:"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "_Starting date:"
-msgstr "Дата початку:"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "day(s)"
+#: calendar/gui/e-tasks.c:146
+#, fuzzy
+msgid "Category:"
 msgstr ""
+"\n"
+"Категор╕╖: "
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "event-editor-dialog"
-msgstr "д╕алог редактора помилок"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "for"
-msgstr "в"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "forever"
-msgstr "завжди"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "label21"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "month(s)"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
+#: calendar/gui/e-tasks.c:285
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Не вдалося завантажити календар в \"%s\""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr ""
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-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:338
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:331
 msgid "Edit Appointment"
 msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:409
 #, fuzzy
 msgid "on"
 msgstr "Пнд"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:435
+msgid "Monday"
+msgstr "Понед╕лок"
+
+#: calendar/gui/event-editor.c:436
+msgid "Tuesday"
+msgstr "В╕второк"
+
+#: calendar/gui/event-editor.c:437
+msgid "Wednesday"
+msgstr "Середа"
+
+#: calendar/gui/event-editor.c:438
+msgid "Thursday"
+msgstr "Четвер"
+
+#: calendar/gui/event-editor.c:439
+msgid "Friday"
+msgstr "П'ятниця"
+
+#: calendar/gui/event-editor.c:440
+msgid "Saturday"
+msgstr "Субота"
+
+#: calendar/gui/event-editor.c:441
+msgid "Sunday"
+msgstr "Нед╕ля"
+
+#: calendar/gui/event-editor.c:561
 #, fuzzy
 msgid "on the"
 msgstr "м╕сяць"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:568
 msgid "th"
 msgstr " "
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:722
 #, fuzzy
 msgid "occurrences"
 msgstr "Джерела"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Не вдалося завантажити календар в \"%s\""
-
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Не вдалося створити календар в \"%s\""
-
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "April"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:7
-msgid "August"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:8
-msgid "December"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:9
-msgid "February"
+#: calendar/gui/gnome-cal.c:696
+#, fuzzy, c-format
+msgid "Could not open the folder in `%s'"
 msgstr ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%s"
 
-#: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
-msgid "Go To Date"
-msgstr "К╕нцева дата"
-
-#: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
-msgid "Go To Today"
-msgstr "сьогодн╕"
-
-#: calendar/gui/goto-dialog.glade.h:12
-msgid "January"
-msgstr ""
+#: calendar/gui/gnome-cal.c:707
+#, fuzzy, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/goto-dialog.glade.h:13
-msgid "July"
-msgstr ""
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Ндл"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "June"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Пнд"
 
-#: calendar/gui/goto-dialog.glade.h:15
-#, fuzzy
-msgid "March"
-msgstr "Пошук"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Втр"
 
-#: calendar/gui/goto-dialog.glade.h:16
-#, fuzzy
-msgid "May"
-msgstr "Понед╕лок"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Срд"
 
-#: calendar/gui/goto-dialog.glade.h:17
-msgid "November"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Чтв"
 
-#: calendar/gui/goto-dialog.glade.h:18
-#, fuzzy
-msgid "October"
-msgstr "╤нша"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Птн"
 
-#: calendar/gui/goto-dialog.glade.h:19
-msgid "September"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Сбт"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати GNOME"
 
@@ -2586,10 +1925,15 @@ msgstr "Поточний р╕к (%Y)"
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "URI, який в╕добразить календар"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
@@ -2680,61 +2024,69 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: нема╓ ╕н╕ц╕ал╕зац╕╖ в модул╕."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:318
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "В╕дм╕нено"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(нев╕домий хост)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr ""
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "В╕дкрити календар"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:297
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:388
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2743,17 +2095,17 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "Рядок URL \"%s\" не м╕стить назви протоколу"
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "Рядок URL \"%s\" не м╕стить нев╕рну назву протоколу"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Номер порта в URL \"%s\" не числовий"
@@ -2770,40 +2122,41 @@ msgstr "Не вдалося створити канал: %s"
 msgid "Bad authentication response from server."
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь OK в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:196
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2815,25 +2168,25 @@ msgstr "IMAP4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження плшти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:361
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2841,21 +2194,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr ""
+#, fuzzy
+msgid "MH-format mail directories"
+msgstr "каталог не Maildir"
 
 #: 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)"
+msgid "Standard Unix mailbox file"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
@@ -2863,7 +2217,7 @@ 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)"
+msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -3203,8 +2557,8 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3233,72 +2587,71 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 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
+#: camel/providers/pop3/camel-pop3-store.c:158
 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
+#: camel/providers/pop3/camel-pop3-store.c:170
 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
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, 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:375
 #, 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:394
 #, 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:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 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:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нев╕рна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3346,130 +2699,124 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достачання пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не визначена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не в╕рна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
-#, fuzzy, c-format
-msgid "RCPT TO response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:574
+#, fuzzy
+msgid "RCPT TO response error: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:604
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:693
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:709
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:732
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -3512,12 +2859,11 @@ msgid "attachment"
 msgstr "долучення"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Видалити"
 
@@ -3533,57 +2879,41 @@ msgstr "Долучити..."
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: composer/e-msg-composer-attachment.glade.h:6
-msgid "Attachment properties"
-msgstr "Властивост╕ долучення"
-
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "File name:"
-msgstr "Назва файлу:"
-
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "MIME type:"
-msgstr "Тип MIME:"
-
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "В╕д:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3591,11 +2921,11 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Введ╕ть тему послання"
 
@@ -3608,91 +2938,87 @@ msgstr ""
 "Не вдалося в╕дкрити файл п╕дпису %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:600
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:611
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:631
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:655
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "В╕дкрити файл"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Цього файлу не ╕сну╓."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "Це не звичайний файл."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1362
 msgid "Compose a message"
 msgstr "П╕дготувати пов╕домлення"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1439
 msgid "Could not create composer window."
 msgstr "Не вдалось створити в╕кно конструктора."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: filter/e-search-bar.c:176
-msgid "Sear_ch"
-msgstr "Пошук"
-
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "р╕к"
@@ -3824,7 +3150,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456
 msgid "Edit Filters"
 msgstr "Редагування в╕льтр╕в"
 
@@ -3924,190 +3250,171 @@ msgstr "Важливо"
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/filter.glade.h:10
-msgid "Edit VFolders"
-msgstr "Виправлення в╕ртуальних тек"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Правила ф╕льтрування"
-
-#: filter/filter.glade.h:12
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "Virtual Folders"
-msgstr "В╕ртуальн╕ теки"
-
-#: filter/filter.glade.h:16
-#, fuzzy
-msgid "vFolder Sources"
-msgstr "Теки"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "п╕сля"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "перед"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "м╕стить"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Скоп╕ювати у теку"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:9
+#: 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 "does not contain"
-msgstr "не м╕стить"
+msgid "Message Header"
+msgstr "Заголовок пов╕домлення"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "не зак╕нчу╓тьтся на"
+msgid "Message was received"
+msgstr "Пов╕домлення було отримано"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "не ╕сну╓"
+msgid "Message was sent"
+msgstr "Пов╕домлення було в╕д╕слано"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "не схоже на"
+msgid "Move to Folder"
+msgstr "Перенести в теку"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "не почина╓ться з"
+msgid "Recipients"
+msgstr "Адресати"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "зак╕нчу╓ться на"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "╕сну╓"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Score"
+msgstr "Моб╕льний"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Вираз"
+msgid "Sender"
+msgstr "В╕дправник"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Переслати на адресу"
+#, fuzzy
+msgid "Set Status"
+msgstr "Стан:"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr ""
+msgid "Source"
+msgstr "Джерело"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "б╕льше"
+msgid "Specific header"
+msgstr ""
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "менше"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#, fuzzy
+msgid "Status"
+msgstr "Стан:"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Т╕ло пов╕домлення"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+msgid "Subject"
+msgstr "Тема"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Заголовок пов╕домлення"
+msgid "after"
+msgstr "п╕сля"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Пов╕домлення було отримано"
+msgid "before"
+msgstr "перед"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Пов╕домлення було в╕д╕слано"
+msgid "contains"
+msgstr "м╕стить"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Перенести в теку"
+msgid "does not contain"
+msgstr "не м╕стить"
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "on or after"
-msgstr "К╕нцева дата"
+msgid "does not end with"
+msgstr "не зак╕нчу╓тьтся на"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr ""
+msgid "does not exist"
+msgstr "не ╕сну╓"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "не схоже на"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Адресати"
+msgid "does not start with"
+msgstr "не почина╓ться з"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "зак╕нчу╓ться на"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "В╕дправник"
+msgid "exists"
+msgstr "╕сну╓"
 
 #: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Set Status"
-msgstr "Стан:"
+msgid "is greater than"
+msgstr "б╕льше"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "схоже на"
+msgid "is less than"
+msgstr "менше"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Джерело"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "почина╓ться на"
+#, fuzzy
+msgid "on or after"
+msgstr "К╕нцева дата"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Status"
-msgstr "Стан:"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr ""
+msgid "sounds like"
+msgstr "схоже на"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Тема"
+msgid "starts with"
+msgstr "почина╓ться на"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4125,11 +3432,6 @@ msgstr "Додати правило"
 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 "Додати правило в╕ртуально╖ теки"
@@ -4138,214 +3440,165 @@ msgstr "Додати правило в╕ртуально╖ теки"
 msgid "Edit VFolder Rule"
 msgstr "Виправити правило в╕ртуально╖ теки"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Зберегти"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Виб╕р теки"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Т╕ло чи тема м╕стить"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Т╕ло м╕стить"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Тема м╕стить"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Т╕ло не м╕стить"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Тема не м╕стить"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "В╕ртуальна тека теми"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "В╕ртуальна тека в╕дправника"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "В╕ртуальна тека отримувач╕в"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Ф╕льтр отримувач╕в"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Показати все"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr ""
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Прибрати"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "В╕дновити"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Прибрати тему"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Ф╕льтр теми"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658
 msgid "Open"
 msgstr "В╕дкрити"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:659
+msgid "Edit"
+msgstr "Виправити"
+
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 msgid "Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "В╕дпов╕сти в╕дправнику"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
 msgid "Reply to All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 msgid "Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666
 #, fuzzy
 msgid "Forward inline"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Позначити як прочитане"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Позначити як непрочитане"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Скоп╕ювати у теку..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 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:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Надрукувати пов╕домлення"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Тема - %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/local-config.glade.h:6
-#, fuzzy
-msgid "Current store format:"
-msgstr "Не вдалось запустити Wombat"
-
-#: mail/local-config.glade.h:7
-#, fuzzy
-msgid "Mailbox Format"
-msgstr "Формат"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Нема╓"
 
-#: mail/local-config.glade.h:8
+#: mail/mail-accounts.c:115
 #, fuzzy
-msgid "New store format:"
-msgstr "Новий тип телефона"
-
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
-msgstr ""
+msgid " (default)"
+msgstr "Стерти"
 
-#: mail/local-config.glade.h:10
-msgid "maildir"
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/local-config.glade.h:11
-msgid "mbox"
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
 msgstr ""
 
-#: mail/local-config.glade.h:12
-msgid "mh"
-msgstr ""
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "╤нсталяц╕я Evolution"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4367,7 +3620,7 @@ msgstr "Пошта в╕д %s"
 msgid "%s mailing list"
 msgstr "Список розсилки %s"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4375,65 +3628,65 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 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
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:594
 msgid "Forwarded message:\n"
 msgstr "Переслане пов╕домлення:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:675
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:677
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4441,477 +3694,48 @@ msgstr ""
 "Файл з ц╕╓ю назвою вже ╕сну╓.\n"
 "Переписати його?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:893
 msgid "Save Message As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:895
 msgid "Save Messages As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:979
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1028
 msgid "Print Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1075
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:6
-msgid "Account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:7
-#, fuzzy
-msgid "Account Information"
-msgstr "Нема╓ ╕нформац╕╖"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-#, fuzzy
-msgid "Account Properties"
-msgstr "Властивост╕ долучення"
-
-#: mail/mail-config-druid.glade.h:11
-#, fuzzy
-msgid "Advanced"
-msgstr "Додатково..."
-
-#: mail/mail-config-druid.glade.h:12
-#, fuzzy
-msgid "Authentication"
-msgstr "Аутенф╕кац╕я:"
-
-#: mail/mail-config-druid.glade.h:13
-#, fuzzy
-msgid "Authentication Type:"
-msgstr "Аутенф╕кац╕я:"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:23
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:24
-#, fuzzy
-msgid "Default"
-msgstr "Стерти"
-
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Не видаляти пов╕домлення з сервера"
-
-#: mail/mail-config-druid.glade.h:27
-#, fuzzy
-msgid "Done"
-msgstr "Нема╓"
-
-#: mail/mail-config-druid.glade.h:28
-#, fuzzy
-msgid "E-Mail Address:"
-msgstr "Електронна адреса:"
-
-#: mail/mail-config-druid.glade.h:30
-#, fuzzy
-msgid "Email Address:"
-msgstr "Електронна адреса:"
-
-#: mail/mail-config-druid.glade.h:31
-#, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Конф╕╜урац╕я пошти"
-
-#: mail/mail-config-druid.glade.h:32
-#, fuzzy
-msgid "Full Name:"
-msgstr "Повна назва:"
-
-#: mail/mail-config-druid.glade.h:35
-#, fuzzy
-msgid "Hostname:"
-msgstr "Назва користувача:"
-
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAP4"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "Incoming Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-#, fuzzy
-msgid "Kerberos"
-msgstr "Kerberos 4"
-
-#: mail/mail-config-druid.glade.h:40
-#, fuzzy
-msgid "Mail"
-msgstr "Пошта"
-
-#: mail/mail-config-druid.glade.h:41
-#, fuzzy
-msgid "Mail Account"
-msgstr "Електронна адреса м╕стить"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Mail Configuration"
-msgstr "Конф╕╜урац╕я пошти"
-
-#: mail/mail-config-druid.glade.h:43
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Конф╕╜урац╕я пошти"
-
-#: mail/mail-config-druid.glade.h:44
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-#, fuzzy
-msgid "News"
-msgstr "Новий"
-
-#: mail/mail-config-druid.glade.h:48
-#, fuzzy
-msgid "Optional"
-msgstr "Параметри"
-
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Ор╕╓нтац╕я:"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Outgoing Mail Server"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-#, fuzzy
-msgid "Password:"
-msgstr "Пароль"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Plain Text"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-#, fuzzy
-msgid "Remember my password"
-msgstr "Запам'ятати цей пароль"
-
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "В╕дпов╕дати на:"
-
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "В╕дпов╕дати на:"
-
-#: mail/mail-config-druid.glade.h:58
-#, fuzzy
-msgid "Required"
-msgstr "Потр╕бн╕ люди"
-
-#: mail/mail-config-druid.glade.h:60
-#, fuzzy
-msgid "Save password"
-msgstr "Зберегти як VCard"
-
-#: mail/mail-config-druid.glade.h:61
-#, fuzzy
-msgid "Select signature file"
-msgstr "Файл п╕дпису:"
-
-#: mail/mail-config-druid.glade.h:62
-#, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
-
-#: mail/mail-config-druid.glade.h:64
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Конф╕╜урац╕я пошти"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-#, fuzzy
-msgid "Server Type: "
-msgstr "Сервер:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Server requires authentication"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-#, fuzzy
-msgid "Servers"
-msgstr "Сервер:"
-
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Файл п╕дпису:"
-
-#: mail/mail-config-druid.glade.h:70
-#, fuzzy
-msgid "Signature:"
-msgstr "Файл п╕дпису:"
-
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Джерела"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:73
-#, fuzzy
-msgid "Type"
-msgstr "Тип:"
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:76
-#, fuzzy
-msgid "User Information"
-msgstr "Нема╓ ╕нформац╕╖"
-
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Назва користувача:"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "хвилина"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Повна назва:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "Електронна адреса:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "Файл п╕дпису"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Сервер:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-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
-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: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"
-"\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:1183
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr ""
-
-#: 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
+#: mail/mail-config-druid.c:363
 #, 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 "З'╓днання усп╕шне!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-gui.c:2348
+#: mail/mail-config-druid.c:629
 #, c-format
-msgid "Query authorization at \"%s\""
-msgstr ""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Адреса"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Поштов╕ джерела"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "Сервери новин"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Джерела новин"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Орган╕зац╕я"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr ""
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Не вказано паролю."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Неможливо створити канал до GPG/PGP: %s"
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Програма GPG/PGP не доспуна."
-
-#: mail/mail-crypto.c:953
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Не вдалося створити тимчасовий файл: %s"
-
 #: mail/mail-display.c:98
 #, c-format
 msgid ""
@@ -4948,65 +3772,65 @@ msgstr "В╕дкрити в %s..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "долучення"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr ""
+#: mail/mail-format.c:626
+msgid "Reply-To:"
+msgstr "В╕дпов╕дати на:"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Зашифроване пов╕домлення"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
@@ -5065,7 +3889,7 @@ msgstr "Створення ново╖ теки"
 msgid "Register local folder"
 msgstr "Створити нову теку"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5093,160 +3917,160 @@ msgstr "Помилка завантаження файлу: %s"
 msgid "Working"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Отримання пошти з %s"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Отримати пошту з %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Нема╓ ново╖ кореспонденц╕╖ на %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:565
 #, fuzzy
 msgid "Sending message"
 msgstr "Стерти це пов╕домлення негайно"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr "В╕дсилання черги"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr "В╕д╕слати чергу"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Додавання \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr "Додавання пов╕домлення без теми"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:912
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перенесення пов╕домлень з \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Коп╕ювання пов╕домлень з \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Перенести пов╕домлення з \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скоп╕ювати пов╕домлення з \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:950
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:953
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:973
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1048
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
 msgid "(No description)"
 msgstr "(Нема╓ опису)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1179
 msgid "Forwarded messages"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1351
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1401
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Викреслення \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання пов╕домлення %d з %d"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1517
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Отримання пов╕домлення %d з %d"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Отримання пов╕домлення %d з %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Завантаження теки %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1677
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Завантажити теку %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1843
 #, fuzzy
 msgid "Saving messages"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1935
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5257,7 +4081,7 @@ msgstr "Помилка збереження файлу: %s"
 msgid "Cancel"
 msgstr "В╕дм╕нити"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
@@ -5361,116 +4185,195 @@ msgstr "Нова в╕ртуальна тека"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138
 msgid "Reply"
 msgstr "В╕дпов╕сти"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138
 msgid "Reply to the sender of this message"
 msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141
 msgid "Reply to all recipients of this message"
 msgstr "В╕дпов╕сти вс╕м отримувачам цього пов╕домлення"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144
 msgid "Forward this message"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148
 msgid "Print the selected message"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150
 msgid "Delete this message"
 msgstr "Стерти це пов╕домлення"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:593
+#: mail/message-list.c:602
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:596
+#: mail/message-list.c:605
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:881
+#: mail/message-list.c:890
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:902 mail/message-list.c:918
 #, c-format
 msgid "%s, et al."
 msgstr "%s, тощо."
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:905 mail/message-list.c:921
 #, fuzzy
 msgid "<unknown>"
 msgstr "Нев╕дома помилка"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:973
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:980
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:989
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:1001
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1009
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1011
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Attachment"
+msgstr "долучення"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "From"
+msgstr "В╕д:"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Date"
+msgstr "п╕сля"
+
+#: mail/message-list.c:1110
+#, fuzzy
+msgid "Received"
+msgstr "Дата отримання"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "To"
+msgstr "До:"
+
+#: mail/message-list.c:1111
+#, fuzzy
+msgid "Size"
+msgstr "Розм╕р:"
+
+#: mail/openpgp-utils.c:78
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Введ╕ть пароль NNTP для %s@%s"
+
+#: mail/openpgp-utils.c:81
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "Програма GPG/PGP не доспуна."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Не вказано паролю."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Неможливо створити канал до GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1065
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Не вдалося створити тимчасовий файл: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Теки"
+
+#: mail/subscribe-dialog.c:63
+#, fuzzy
+msgid "Store"
+msgstr "Моб╕льний"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "При╓днання до теки \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "В╕д'╓днання в╕д теки \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:297
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "При╓днатись до теки \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "В╕д'╓днатись в╕д теки \"%s\""
@@ -5568,30 +4471,31 @@ msgstr ""
 msgid "New..."
 msgstr "Новий..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Ненайменований)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, 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:334
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
@@ -5599,13 +4503,18 @@ msgstr "Перейти на теку..."
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Теки"
 
-#: shell/e-shell-view.c:1077
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-view.c:1098
+#, fuzzy, c-format
+msgid "%s - Evolution %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:1100
+#, fuzzy, c-format
+msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
 #: shell/e-shell.c:372
@@ -5613,74 +4522,84 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, 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
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлик╕ як мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Актив╕зувати"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -5688,12 +4607,11 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: shell/e-storage-set-view.c:338
 msgid "_View"
 msgstr "Вид"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:338
 msgid "View the selected folder"
 msgstr "Показати вибрану теки"
 
@@ -5785,1240 +4703,1649 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
-msgstr "Створити новий контакт"
-
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete a contact"
-msgstr "Стерти контакт"
+#: ui/evolution-contact-editor.xml:7
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "Нова зустр╕ч..."
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
-msgid "Find"
-msgstr "Знайти"
+#: ui/evolution-contact-editor.xml:8
+msgid "FIXME: Meeting Re_quest"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Find a contact"
-msgstr "Знайти контакт"
+#: ui/evolution-contact-editor.xml:10
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "Виправити пов╕домлення"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
-msgid "New"
-msgstr "Новий"
+#: ui/evolution-contact-editor.xml:11
+msgid "FIXME: _Contact"
+msgstr "Контакт"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "Print contacts"
-msgstr "Надрукувати контакти"
+#: ui/evolution-contact-editor.xml:12
+msgid "FIXME: _Task"
+msgstr "Завдання"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Stop"
-msgstr "Зупинити"
+#: ui/evolution-contact-editor.xml:13
+msgid "FIXME: Task _Request"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
-msgid "Stop Loading"
-msgstr "Зупинити завантаження"
+#: ui/evolution-contact-editor.xml:14
+msgid "FIXME: _Journal Entry"
+msgstr "Журнальний запис"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "View All"
-msgstr "Показати все"
+#: ui/evolution-contact-editor.xml:15
+msgid "FIXME: _Note"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "View all contacts"
-msgstr "Показати вс╕ контакти"
+#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
-msgid "_Addressbook Configuration..."
-msgstr "Конф╕╜урац╕я адресно╖ книги..."
+#: ui/evolution-contact-editor.xml:22
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_Print Contacts..."
-msgstr "Надрукувати контакти..."
+#: ui/evolution-contact-editor.xml:24
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "_Search for contacts"
-msgstr "Пошук контакт╕в"
+#: ui/evolution-contact-editor.xml:31
+msgid "FIXME: S_end"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
-msgid "_Tools"
-msgstr "╤нструменти"
+#: ui/evolution-contact-editor.xml:35
+msgid "FIXME: Save Attac_hments..."
+msgstr "Зберегти долучення..."
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-calendar.xml.h:6
-msgid "5 Days"
-msgstr "5 Дн╕в"
+#: ui/evolution-contact-editor.xml:38
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "Перенести в теку"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Alter preferences"
-msgstr ""
+#: ui/evolution-contact-editor.xml:39
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Скоп╕ювати у теку..."
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Ca_lendar"
-msgstr "Календар"
+#: ui/evolution-contact-editor.xml:41
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Параметри стор╕нки:"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Calendar Preferences..."
-msgstr "Параметри календаря..."
+#: ui/evolution-contact-editor.xml:42
+msgid "FIXME: Print Pre_view"
+msgstr "Перегляд друку"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Create a new appointment"
-msgstr "Створити нову зустр╕ч"
+#: ui/evolution-contact-editor.xml:63
+#, fuzzy
+msgid "FIXME: Paste _Special..."
+msgstr "Граматика..."
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Create a new calendar"
-msgstr "Створити новий календар"
+#: ui/evolution-contact-editor.xml:68
+#, fuzzy
+msgid "FIXME: Mark as U_nread"
+msgstr "Позначити як непрочитане"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "День"
+#: ui/evolution-contact-editor.xml:72
+msgid "_Object"
+msgstr "Об'╓кт"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go back in time"
-msgstr "Перейти назад в час╕"
+#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
+msgid "FIXME: _Item"
+msgstr "Елемент"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go forward in time"
-msgstr "Перейти вперед в час╕"
+#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to"
-msgstr "Перейти"
+#: ui/evolution-contact-editor.xml:79
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "Перший елемент у тец╕"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to a specific date"
-msgstr "Перейти до вказано╖ дати"
+#: ui/evolution-contact-editor.xml:86
+msgid "FIXME: _Last Item in Folder"
+msgstr "Останн╕й елемент у тец╕"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to present time"
-msgstr "Поперейти в точний час"
+#: ui/evolution-contact-editor.xml:91
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Month"
-msgstr "М╕сяць"
+#: ui/evolution-contact-editor.xml:93
+#, fuzzy
+msgid "FIXME: __Formatting"
+msgstr "Форматування"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
-msgid "Next"
-msgstr "Дал╕"
+#: ui/evolution-contact-editor.xml:96
+msgid "FIXME: _Customize..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Open a calendar"
-msgstr "В╕дкрити календар"
+#: ui/evolution-contact-editor.xml:101
+msgid "Pre_vious"
+msgstr "Попередн╕й"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Prev"
-msgstr "Повернутись"
+#: ui/evolution-contact-editor.xml:102
+#, fuzzy
+msgid "Ne_xt"
+msgstr "Дал╕"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Print this calendar"
-msgstr "Надрукувати цей календар"
+#: ui/evolution-contact-editor.xml:104
+msgid "_Toolbars"
+msgstr "панео╕ ╕нструмен╕в"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Save calendar as something else"
-msgstr "Зберегти календар як щось ╕нше"
+#: ui/evolution-contact-editor.xml:109
+msgid "FIXME: _File..."
+msgstr "Файл..."
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 day"
-msgstr "Показати 1 день"
+#: ui/evolution-contact-editor.xml:110
+msgid "FIXME: It_em..."
+msgstr "Елемент..."
 
-#: ui/evolution-calendar.xml.h:27
-msgid "Show 1 month"
-msgstr "Показати 1 м╕сяць"
+#: ui/evolution-contact-editor.xml:111
+msgid "FIXME: _Object..."
+msgstr "Об'╓кт..."
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Show 1 week"
-msgstr "Показати 1 тиждень"
+#: ui/evolution-contact-editor.xml:116
+msgid "FIXME: _Font..."
+msgstr "Шрифт..."
 
-#: ui/evolution-calendar.xml.h:29
-msgid "Show the working week"
-msgstr "Показати робочий тиждень"
+#: ui/evolution-contact-editor.xml:117
+msgid "FIXME: _Paragraph..."
+msgstr "Абзац..."
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "сьогодн╕"
+#: ui/evolution-contact-editor.xml:124
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Week"
-msgstr "Тиждень"
+#: ui/evolution-contact-editor.xml:125
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
-msgid "_New"
-msgstr "Новий"
+#: ui/evolution-contact-editor.xml:127
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Open Calendar"
-msgstr "В╕дкрити календар"
+#: ui/evolution-contact-editor.xml:128
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_Print this calendar"
-msgstr "Надрукувати цей календар"
+#: ui/evolution-contact-editor.xml:130
+msgid "FIXME: Script _Debugger"
+msgstr "Налагодження скрипт╕в"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Save As..."
-msgstr "Зберегти як..."
+#: ui/evolution-contact-editor.xml:135
+msgid "FIXME: _Spelling..."
+msgstr "Граматика..."
 
-#: ui/evolution-contact-editor.xml.h:7
-msgid "Delete this item"
-msgstr "Стерти цей елемент"
+#: ui/evolution-contact-editor.xml:137
+msgid "_Forms"
+msgstr "Форми"
 
-#: ui/evolution-contact-editor.xml.h:8
-msgid "Delete..."
-msgstr "Стерти..."
+#: ui/evolution-contact-editor.xml:142
+#, fuzzy
+msgid "FIXME: _New Contact"
+msgstr "Контакт"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Help"
-msgstr "Дов╕дка"
+#: ui/evolution-contact-editor.xml:143
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Print En_velope..."
-msgstr "Надрукувати конверт..."
+#: ui/evolution-contact-editor.xml:145
+#, fuzzy
+msgid "FIXME: New _Letter to Contact"
+msgstr "Контакт"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
-msgid "Print this item"
-msgstr "Надрукувати цей елемент"
+#: ui/evolution-contact-editor.xml:146
+#, fuzzy
+msgid "FIXME: New _Message to Contact"
+msgstr "В╕д╕слати пов╕домлення за контактом..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
-msgid "Print..."
-msgstr "Друкувати..."
+#: ui/evolution-contact-editor.xml:147
+#, fuzzy
+msgid "FIXME: New Meetin_g with Contact"
+msgstr "Контакт"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Зберегти як..."
+#: ui/evolution-contact-editor.xml:148
+#, fuzzy
+msgid "FIXME: _Plan a Meeting..."
+msgstr "Граматика..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-msgid "Save and Close"
-msgstr "Зберегти та закрити"
+#: ui/evolution-contact-editor.xml:149
+#, fuzzy
+msgid "FIXME: New _Task for Contact"
+msgstr "Контакт"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "Save the contact and close the dialog box"
-msgstr "Зберегти контакт ╕ закрити д╕алог"
+#: ui/evolution-contact-editor.xml:150
+#, fuzzy
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr "Журнальний запис"
 
-#: ui/evolution-contact-editor.xml.h:16
-msgid "Se_nd contact to other..."
-msgstr "В╕д╕слати контакт ╕ншому..."
+#: ui/evolution-contact-editor.xml:152
+#, fuzzy
+msgid "FIXME: _Flag for Follow Up..."
+msgstr "Скоп╕ювати у теку..."
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
-msgid "See online help"
-msgstr ""
+#: ui/evolution-contact-editor.xml:153
+#, fuzzy
+msgid "FIXME: _Display Map of Address"
+msgstr "Виправити пов╕домлення"
 
-#: ui/evolution-contact-editor.xml.h:18
-msgid "Send _message to contact..."
-msgstr "В╕д╕слати пов╕домлення за контактом..."
+#: ui/evolution-contact-editor.xml:154
+#, fuzzy
+msgid "FIXME: _Open Web Page"
+msgstr "Виправити пов╕домлення"
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
-msgid "_File"
-msgstr "Файл"
+#: ui/evolution-contact-editor.xml:156
+#, fuzzy
+msgid "FIXME: Forward as _vCard"
+msgstr "Переслати"
 
-#: ui/evolution-contact-editor.xml.h:20
-msgid "_Print..."
-msgstr "Друкувати..."
+#: ui/evolution-contact-editor.xml:157
+msgid "FIXME: For_ward"
+msgstr "Переслати"
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Save"
-msgstr "Зберегти"
+#: ui/evolution-contact-editor.xml:169
+msgid "_Insert"
+msgstr "Вставити"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-event-editor.xml.h:6
-msgid "About this application"
-msgstr "Про цю програму"
+#: ui/evolution-contact-editor.xml:170
+msgid "F_ormat"
+msgstr "Формат"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "About..."
-msgstr "Про..."
+#: ui/evolution-contact-editor.xml:171
+msgid "_Tools"
+msgstr "╤нструменти"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-contact-editor.xml:172
 msgid "Actio_ns"
 msgstr "Д╕╖"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "C_lear"
-msgstr "Очистити"
+#: ui/evolution-contact-editor.xml:246
+#, fuzzy
+msgid "FIXME: Previous"
+msgstr "Попередн╕й"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "C_ut"
-msgstr "Вир╕зати"
+#: ui/evolution-contact-editor.xml:247
+msgid "Go to the previous item"
+msgstr "Перейти до попереднього елементу"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Clear"
-msgstr "Очистити"
+#: ui/evolution-contact-editor.xml:249
+#, fuzzy
+msgid "FIXME: Next"
+msgstr "Дов╕дка"
 
-#: ui/evolution-event-editor.xml.h:12
-msgid "Clear the selection"
-msgstr "Очистити вибране"
+#: ui/evolution-contact-editor.xml:250
+msgid "Go to the next item"
+msgstr "Перейти до наступного елементу"
 
-#: ui/evolution-event-editor.xml.h:14
-msgid "Close this appointment"
-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:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
-msgid "Copy"
-msgstr "Скоп╕ювати"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16
-msgid "Copy the selection"
-msgstr "Скоп╕ювати вибране"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Зайнятий"
 
-#: ui/evolution-event-editor.xml.h:17
-msgid "Cut"
-msgstr "Вир╕зати"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "За межами оф╕су"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Cut the selection"
-msgstr "Вир╕зати вибране"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-event-editor.xml.h:21
-msgid "Dump XML"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "Запросити ╕нших..."
 
-#: ui/evolution-event-editor.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "Параметри"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "Адресна книга..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
-msgid "FIXME: Ch_oose Form..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
-msgid "FIXME: Chec_k Names"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Скоп╕ювати у теку..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "Автовиб╕р"
 
-#: ui/evolution-event-editor.xml.h:28
-msgid "FIXME: Define Print _Styles"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr "_>>"
 
-#: ui/evolution-event-editor.xml.h:29
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "Вс╕ люди ╕ ресурси"
 
-#: ui/evolution-event-editor.xml.h:30
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "Перший елемент у тец╕"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Вс╕ люди ╕ один ресурс"
 
-#: ui/evolution-event-editor.xml.h:31
-msgid "FIXME: For_ward"
-msgstr "Переслати"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Потр╕бн╕ люди"
 
-#: ui/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Потр╕бн╕ люди ╕ один ресурс"
 
-#: ui/evolution-event-editor.xml.h:33
-msgid "FIXME: Help"
-msgstr "Дов╕дка"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Час початку з╕брання:"
 
-#: ui/evolution-event-editor.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr ""
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Час завершення з╕брання:"
 
-#: ui/evolution-event-editor.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "Вставити файл"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Весь супров╕д"
 
-#: ui/evolution-event-editor.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "Елемент..."
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "ПВСЧПСН"
 
-#: ui/evolution-event-editor.xml.h:37
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: ui/evolution-event-editor.xml.h:38
-msgid "FIXME: Print Pre_view"
-msgstr "Перегляд друку"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#: ui/evolution-event-editor.xml.h:39
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "зараз"
 
-#: ui/evolution-event-editor.xml.h:40
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "сьогодн╕"
 
-#: ui/evolution-event-editor.xml.h:41
-msgid "FIXME: Rec_urrence..."
-msgstr ""
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ui/evolution-event-editor.xml.h:42
-msgid "FIXME: S_end"
-msgstr ""
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "FIXME: Save Attac_hments..."
-msgstr "Зберегти долучення..."
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "Пошук"
 
-#: ui/evolution-event-editor.xml.h:44
-msgid "FIXME: Script _Debugger"
-msgstr "Налагодження скрипт╕в"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Група %i"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Task _Request"
-msgstr ""
+#~ msgid "Delete Contact?"
+#~ msgstr "Стерти контакт?"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "Контакт"
+#~ msgid "Address _2:"
+#~ msgstr "Адреса _2:"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr ""
+#~ msgid "Canada"
+#~ msgstr "Канада"
 
-#: ui/evolution-event-editor.xml.h:48
-msgid "FIXME: _File..."
-msgstr "Файл..."
+#~ msgid "Check Address"
+#~ msgstr "Перев╕рка адреси"
 
-#: ui/evolution-event-editor.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "Шрифт..."
+#~ msgid "Countr_y:"
+#~ msgstr "Кра╖на:"
 
-#: ui/evolution-event-editor.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "Форматування"
+#~ msgid "Finland"
+#~ msgstr "Ф╕нлянд╕я"
 
-#: ui/evolution-event-editor.xml.h:51
-msgid "FIXME: _Item"
-msgstr "Елемент"
+#~ msgid "USA"
+#~ msgstr "США"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "Журнальний запис"
+#~ msgid "_Address:"
+#~ msgstr "Адреса:"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "Останн╕й елемент у тец╕"
+#~ msgid "_City:"
+#~ msgstr "М╕сто:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "А/С:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "Штат/область:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "╤ндекс:"
 
-#: ui/evolution-event-editor.xml.h:54
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Виправити пов╕домлення"
+#~ msgid "Addressbook Sources"
+#~ msgstr "Додати джерело"
 
-#: ui/evolution-event-editor.xml.h:55
-msgid "FIXME: _Memo Style"
-msgstr ""
+#~ msgid "Find..."
+#~ msgstr "Шукати..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "Адресати пов╕домлення"
+
+#~ msgid "Select Names"
+#~ msgstr "Вибрати назви"
 
-#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "Перенести в теку"
+#~ msgid "Select name from:"
+#~ msgstr "Вибер╕ть назву з списку:"
+
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "Tahoma 10 пт"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "Tahoma 8 пт"
+
+#~ msgid "Body"
+#~ msgstr "Т╕ло"
+
+#~ msgid "Bottom:"
+#~ msgstr "Внизу:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Розм╕ри:"
+
+#~ msgid "Font..."
+#~ msgstr "Шрифт..."
+
+#~ msgid "Fonts"
+#~ msgstr "Шрифти"
+
+#~ msgid "Footer:"
+#~ msgstr "Нижн╕й колонтитул:"
+
+#~ msgid "Format"
+#~ msgstr "Формат"
+
+#~ msgid "Header"
+#~ msgstr "Верхн╕й колонтитул"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Колонтитули"
+
+#~ msgid "Headings"
+#~ msgstr "Верхн╕ колонтитули"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Верхн╕ колонтитули для кожного листа"
+
+#~ msgid "Height:"
+#~ msgstr "Висота:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Один за другим"
+
+#~ msgid "Include:"
+#~ msgstr "Включити:"
+
+#~ msgid "Landscape"
+#~ msgstr "Альбомна"
+
+#~ msgid "Left:"
+#~ msgstr "Л╕воруч:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Закладки л╕тер збоку"
+
+#~ msgid "Margins"
+#~ msgstr "Поля"
+
+#~ msgid "Number of columns:"
+#~ msgstr "К╕льк╕сть стовпчик╕в:"
+
+#~ msgid "Options"
+#~ msgstr "Параметри"
+
+#~ msgid "Orientation"
+#~ msgstr "Ор╕╓нтац╕я"
+
+#~ msgid "Page"
+#~ msgstr "Стор╕нка"
+
+#~ msgid "Paper"
+#~ msgstr "Пап╕р"
+
+#~ msgid "Paper source:"
+#~ msgstr "Джерело паперу:"
+
+#~ msgid "Portrait"
+#~ msgstr "Книжна"
+
+#~ msgid "Preview:"
+#~ msgstr "Перегляд:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Друк з використанням нап╕втон╕в"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Обертати на парних стор╕нках"
+
+#~ msgid "Right:"
+#~ msgstr "Праворуч:"
+
+#~ msgid "Sections:"
+#~ msgstr "Розд╕ли:"
+
+#~ msgid "Shading"
+#~ msgstr "П╕втони"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Починати з ново╖ стор╕нки"
+
+#~ msgid "Style name:"
+#~ msgstr "Назва стилю:"
+
+#~ msgid "Top:"
+#~ msgstr "Вгор╕:"
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Width:"
+#~ msgstr "Ширина:"
+
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "Нова зустр╕ч..."
+#~ msgid "Calendar Server"
+#~ msgstr "Календар"
 
-#: ui/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr ""
+#, fuzzy
+#~ msgid "Evolution calendar iTip/iMip viewer"
+#~ msgstr "Канал календаря Evolution"
 
-#: ui/evolution-event-editor.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "Об'╓кт..."
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: ui/evolution-event-editor.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "Абзац..."
+#~ msgid "Edit appointment"
+#~ msgstr "Виправити зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:61
-msgid "FIXME: _Spelling..."
-msgstr "Граматика..."
+#~ msgid "Snooze time (minutes)"
+#~ msgstr "Час сну (в хвилинах)"
 
-#: ui/evolution-event-editor.xml.h:62
-msgid "FIXME: _Standard"
-msgstr ""
+#~ msgid "05 minutes"
+#~ msgstr "05 хвилин"
 
-#: ui/evolution-event-editor.xml.h:63
-msgid "FIXME: _Task"
-msgstr "Завдання"
+#~ msgid "10 minutes"
+#~ msgstr "10 хвилин"
 
-#: ui/evolution-event-editor.xml.h:64
-msgid "FIXME: _Unread Item"
-msgstr ""
+#~ msgid "12 hour (am/pm)"
+#~ msgstr "12 годин (дп/пп)"
 
-#: ui/evolution-event-editor.xml.h:65
-msgid "FIXME: what goes here?"
-msgstr ""
+#~ msgid "15 minutes"
+#~ msgstr "15 хвилин"
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
-msgid "F_ormat"
-msgstr "Формат"
+#~ msgid "24 hour"
+#~ msgstr "24 години"
 
-#: ui/evolution-event-editor.xml.h:68
-msgid "Find Again"
-msgstr "Шукати дал╕"
+#~ msgid "30 minutes"
+#~ msgstr "30 хвилин"
 
-#: ui/evolution-event-editor.xml.h:69
-msgid "Find _Again"
-msgstr "Шукати дал╕"
+#~ msgid "60 minutes"
+#~ msgstr "60 хвилин"
 
-#: ui/evolution-event-editor.xml.h:70
-msgid "Go to the next item"
-msgstr "Перейти до наступного елементу"
+#~ msgid "Calendar"
+#~ msgstr "Календар"
 
-#: ui/evolution-event-editor.xml.h:71
-msgid "Go to the previous item"
-msgstr "Перейти до попереднього елементу"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Параметри календаря"
 
-#: ui/evolution-event-editor.xml.h:72
-msgid "Modify the file's properties"
-msgstr ""
+#~ msgid "Colors"
+#~ msgstr "Кольори"
 
-#: ui/evolution-event-editor.xml.h:73
-msgid "N_ext"
-msgstr "Наступний"
+#~ msgid "End of day:"
+#~ msgstr "К╕нець дня:"
 
-#: ui/evolution-event-editor.xml.h:75
-msgid "Paste"
-msgstr "Вставити"
+#~ msgid "First day of week:"
+#~ msgstr "Перший день тижня:"
 
-#: ui/evolution-event-editor.xml.h:76
-msgid "Paste the clipboard"
-msgstr "Вставити буфер обм╕ну"
+#~ msgid "Pick a color"
+#~ msgstr "Виб╕р кольору"
 
-#: ui/evolution-event-editor.xml.h:77
-msgid "Pre_vious"
-msgstr "Попередн╕й"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Нагадувати про вс╕ зустр╕ч╕"
 
-#: ui/evolution-event-editor.xml.h:78
-msgid "Previous"
-msgstr "Попередн╕й"
+#~ msgid "Reminders"
+#~ msgstr "Нагадування"
 
-#: ui/evolution-event-editor.xml.h:79
-msgid "Print S_etup..."
-msgstr "Параметри друку..."
+#~ msgid "Show"
+#~ msgstr "Показати"
 
-#: ui/evolution-event-editor.xml.h:80
-msgid "Print Setup"
-msgstr "Параметри друку"
+#~ msgid "Show week numbers"
+#~ msgstr "Показати номера тижн╕в"
 
-#: ui/evolution-event-editor.xml.h:83
-msgid "Properties"
-msgstr "Властивост╕"
+#~ msgid "Start of day:"
+#~ msgstr "Початок дня:"
 
-#: ui/evolution-event-editor.xml.h:84
-msgid "Redo"
-msgstr "Повторити"
+#~ msgid "TaskPad"
+#~ msgstr "Панель завдань"
 
-#: ui/evolution-event-editor.xml.h:85
-msgid "Redo the undone action"
-msgstr "Повторити в╕дм╕нену д╕ю"
+#~ msgid "Time divisions:"
+#~ msgstr "Розд╕лювач╕ часу:"
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Replace"
-msgstr "Зам╕нити"
+#~ msgid "Time format:"
+#~ msgstr "Формат часу:"
 
-#: ui/evolution-event-editor.xml.h:87
-msgid "Replace a string"
-msgstr "Зам╕нити рядок"
+#~ msgid "Work week"
+#~ msgstr "Робочий тиждень"
 
-#: ui/evolution-event-editor.xml.h:91
-msgid "Save the appointment and close the dialog box"
-msgstr ""
+#~ msgid "% Comp_lete:"
+#~ msgstr "% завершення:"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
-msgid "Save the current file"
-msgstr "Зберегти поточний файл"
+#~ msgid "C_lassification:"
+#~ msgstr "Класиф╕кац╕я:"
 
-#: ui/evolution-event-editor.xml.h:93
-msgid "Schedule Meeting"
-msgstr "Планування зустр╕ч╕"
+#~ msgid "Date Completed:"
+#~ msgstr "Дата виконання:"
 
-#: ui/evolution-event-editor.xml.h:94
-msgid "Schedule _Meeting"
-msgstr "Планувати зустр╕ч"
+#~ msgid "High"
+#~ msgstr "Високий"
 
-#: ui/evolution-event-editor.xml.h:95
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#~ msgid "In Progress"
+#~ msgstr "Викону╓ться"
+
+#~ msgid "Low"
+#~ msgstr "Низький"
+
+#~ msgid "Normal"
+#~ msgstr "Звичайний"
+
+#~ msgid "Not Started"
+#~ msgstr "Не розпочато"
+
+#~ msgid "Task"
+#~ msgstr "Завдання"
+
+#~ msgid "_Contacts..."
+#~ msgstr "Контакти..."
+
+#~ msgid "_Priority:"
+#~ msgstr "Пр╕оритет:"
+
+#~ msgid "_Status:"
+#~ msgstr "Стан:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "П╕дстави зустр╕ч╕"
+
+#~ msgid "Days"
+#~ msgstr "Дн╕"
+
+#~ msgid "Every"
+#~ msgstr "Кожен"
+
+#~ msgid "Exceptions"
+#~ msgstr "Виключення"
+
+#~ msgid "Hours"
+#~ msgstr "Години"
 
-#: ui/evolution-event-editor.xml.h:96
-msgid "Search again for the same string"
-msgstr "Шукати зновуй той же рядок"
+#~ msgid "Mail _to:"
+#~ msgstr "Лист до:"
 
-#: ui/evolution-event-editor.xml.h:97
-msgid "Search for a string"
-msgstr "Пошук рядка"
+#~ msgid "Minutes"
+#~ msgstr "Хвилини"
 
-#: ui/evolution-event-editor.xml.h:99
-msgid "Select All"
-msgstr "Вибрати все"
+#~ msgid "Modify"
+#~ msgstr "Зм╕нити"
+
+#~ msgid "No recurrence"
+#~ msgstr "Без повторення"
+
+#~ msgid "Preview"
+#~ msgstr "Перегляд"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Особисте"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Публ╕чне"
+
+#~ msgid "Recurrence"
+#~ msgstr "Повторення"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило повторення"
+
+#~ msgid "Reminder"
+#~ msgstr "Нагадування"
+
+#~ msgid "Simple recurrence"
+#~ msgstr "Просте повторення"
+
+#~ msgid "Time"
+#~ msgstr "Час"
+
+#~ msgid "_Audio"
+#~ msgstr "Ауд╕о"
+
+#~ msgid "_Mail"
+#~ msgstr "Пошта"
+
+#~ msgid "_Program"
+#~ msgstr "Програма"
+
+#~ msgid "_Run program:"
+#~ msgstr "Запустити програму:"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Дата початку:"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "д╕алог редактора помилок"
+
+#~ msgid "for"
+#~ msgstr "в"
+
+#~ msgid "forever"
+#~ msgstr "завжди"
+
+#~ msgid "label21"
+#~ msgstr "label26"
+
+#~ msgid "month(s)"
+#~ msgstr "м╕сяць"
+
+#~ msgid "year(s)"
+#~ msgstr "р╕к"
+
+#~ msgid "Could not create a calendar in `%s'"
+#~ msgstr "Не вдалося створити календар в \"%s\""
 
-#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
-msgid "Select everything"
-msgstr "Вибрати назви"
+#~ msgid "Go To Date"
+#~ msgstr "К╕нцева дата"
 
-#: ui/evolution-event-editor.xml.h:101
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#, fuzzy
+#~ msgid "Go To Today"
+#~ msgstr "сьогодн╕"
 
-#: ui/evolution-event-editor.xml.h:102
-msgid "Undo"
-msgstr "В╕дм╕нити"
+#, fuzzy
+#~ msgid "March"
+#~ msgstr "Пошук"
 
-#: ui/evolution-event-editor.xml.h:103
-msgid "Undo the last action"
-msgstr "В╕дм╕нити останню операц╕ю"
+#, fuzzy
+#~ msgid "May"
+#~ msgstr "Понед╕лок"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
-msgid "_About..."
-msgstr "Про..."
+#, fuzzy
+#~ msgid "October"
+#~ msgstr "╤нша"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
-msgid "_Close"
-msgstr "Закрити"
+#~ msgid "Attachment properties"
+#~ msgstr "Властивост╕ долучення"
 
-#: ui/evolution-event-editor.xml.h:106
-msgid "_Copy"
-msgstr "Скоп╕ювати"
+#~ msgid "File name:"
+#~ msgstr "Назва файлу:"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
-msgid "_Debug"
-msgstr ""
+#~ msgid "MIME type:"
+#~ msgstr "Тип MIME:"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
-msgid "_Edit"
-msgstr "Редагування"
+#~ msgid "Edit VFolders"
+#~ msgstr "Виправлення в╕ртуальних тек"
 
-#: ui/evolution-event-editor.xml.h:111
-msgid "_Find..."
-msgstr "Знайти..."
+#~ msgid "Filter Rules"
+#~ msgstr "Правила ф╕льтрування"
 
-#: ui/evolution-event-editor.xml.h:112
-msgid "_Forms"
-msgstr "Форми"
+#~ msgid "Virtual Folders"
+#~ msgstr "В╕ртуальн╕ теки"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
-msgid "_Help"
-msgstr "Дов╕дка"
+#, fuzzy
+#~ msgid "vFolder Sources"
+#~ msgstr "Теки"
 
-#: ui/evolution-event-editor.xml.h:114
-msgid "_Insert"
-msgstr "Вставити"
+#~ msgid "Save"
+#~ msgstr "Зберегти"
 
-#: ui/evolution-event-editor.xml.h:115
-msgid "_Object"
-msgstr "Об'╓кт"
+#, fuzzy
+#~ msgid "Show all hidden"
+#~ msgstr "Показати все"
 
-#: ui/evolution-event-editor.xml.h:116
-msgid "_Paste"
-msgstr "Вставити"
+#, fuzzy
+#~ msgid "Hide read"
+#~ msgstr "Прибрати"
 
-#: ui/evolution-event-editor.xml.h:117
-msgid "_Print"
-msgstr "Друкувати"
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "В╕дновити"
 
-#: ui/evolution-event-editor.xml.h:118
-msgid "_Properties..."
-msgstr "Властивост╕..."
+#~ msgid "Hide Subject"
+#~ msgstr "Прибрати тему"
 
-#: ui/evolution-event-editor.xml.h:119
-msgid "_Redo"
-msgstr "Повторити"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Ф╕льтр теми"
 
-#: ui/evolution-event-editor.xml.h:120
-msgid "_Replace..."
-msgstr "Зам╕нити..."
+#, fuzzy
+#~ msgid "Hide Messages"
+#~ msgstr "Надрукувати пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:122
-msgid "_Toolbars"
-msgstr "панео╕ ╕нструмен╕в"
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Тема - %s"
 
-#: ui/evolution-event-editor.xml.h:124
-msgid "_Undo"
-msgstr "В╕дм╕нити"
+#, fuzzy
+#~ msgid "Current store format:"
+#~ msgstr "Не вдалось запустити Wombat"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-mail.xml.h:6
-msgid "Compose"
-msgstr "П╕дготувати"
+#, fuzzy
+#~ msgid "Mailbox Format"
+#~ msgstr "Формат"
 
-#: ui/evolution-mail.xml.h:7
-msgid "Compose a new message"
-msgstr "Скласти нове пов╕домлення"
+#, fuzzy
+#~ msgid "New store format:"
+#~ msgstr "Новий тип телефона"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy message to a new folder"
-msgstr "Скоп╕ювати пов╕домлення у нову теку"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Ви не ма╓тете сконф╕╜урованих джерел пошти"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
-msgid "F_older"
-msgstr "Тека"
+#, fuzzy
+#~ msgid "Account Information"
+#~ msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Fi_lter on Sender"
-msgstr "Ф╕льтр в╕дправника"
+#, fuzzy
+#~ msgid "Account Properties"
+#~ msgstr "Властивост╕ долучення"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Filter on Rec_ipients"
-msgstr "Ф╕льтр отримувач╕в"
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Додатково..."
 
-#: ui/evolution-mail.xml.h:16
-msgid "Forget _Passwords"
-msgstr "Забути парол╕"
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "Аутенф╕кац╕я:"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Get Mail"
-msgstr "Отримати пошту"
+#, fuzzy
+#~ msgid "Authentication Type:"
+#~ msgstr "Аутенф╕кац╕я:"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
-msgstr "Прибрати стерт╕ пов╕домлення"
+#, fuzzy
+#~ msgid "Delete mail from server"
+#~ msgstr "Не видаляти пов╕домлення з сервера"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Hide _Read messages"
-msgstr "Прибрати прочитан╕ пов╕домлення"
+#, fuzzy
+#~ msgid "Done"
+#~ msgstr "Нема╓"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "Прибрати вибран╕ пов╕домлення"
+#, fuzzy
+#~ msgid "E-Mail Address:"
+#~ msgstr "Електронна адреса:"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Mail _Filters..."
-msgstr "Поштов╕ ф╕льтри..."
+#, fuzzy
+#~ msgid "Email Address:"
+#~ msgstr "Електронна адреса:"
 
-#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions..."
-msgstr "Опис:"
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Конф╕╜урац╕я пошти"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Mar_k As Read"
-msgstr "Позначити як прочитане"
+#, fuzzy
+#~ msgid "Full Name:"
+#~ msgstr "Повна назва:"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Mark As U_nread"
-msgstr "Позначити як непрочитане"
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Назва користувача:"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Move"
-msgstr "Перенести"
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAP4"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Move message to a new folder"
-msgstr "Перенести пов╕домлення у нову теку"
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Previews the message to be printed"
-msgstr "Переглянути пов╕домлення, що буде надрукувано"
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "Пошта"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Print Preview of message..."
-msgstr "Перегляд друку пов╕домлення..."
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Електронна адреса м╕стить"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Print message to the printer"
-msgstr "Надрукувати пов╕домлення на принтер╕"
+#~ msgid "Mail Configuration"
+#~ msgstr "Конф╕╜урац╕я пошти"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Print message..."
-msgstr "Надрукувати пов╕домлення..."
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Конф╕╜урац╕я пошти"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Reply to _All"
-msgstr "В╕дпов╕сти вс╕м"
+#, fuzzy
+#~ msgid "News"
+#~ msgstr "Новий"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Reply to _Sender"
-msgstr "В╕дпов╕сти в╕дправнику"
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Параметри"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
-msgid "Select _All"
-msgstr "Вибрати все"
+#~ msgid "Organization:"
+#~ msgstr "Ор╕╓нтац╕я:"
 
-#: ui/evolution-mail.xml.h:44
-msgid "Send queued mail and retrieve new mail"
-msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Пароль"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Show _All messages"
-msgstr "Показати вс╕ пов╕домлення"
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Запам'ятати цей пароль"
 
-#: ui/evolution-mail.xml.h:46
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Переслати це пов╕домлення"
+#~ msgid "Reply-to:"
+#~ msgstr "В╕дпов╕дати на:"
 
-#: ui/evolution-mail.xml.h:47
-msgid "VFolder on Se_nder"
-msgstr "В╕ртуальна тека в╕дправника"
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Потр╕бн╕ люди"
 
-#: ui/evolution-mail.xml.h:48
-msgid "VFolder on _Recipients"
-msgstr "В╕ртуальна тека отримувач╕в"
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Зберегти як VCard"
 
-#: ui/evolution-mail.xml.h:49
-msgid "View Raw Message Source"
-msgstr ""
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Файл п╕дпису:"
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Apply Filters"
-msgstr "Застосувати ф╕льтри"
+#, fuzzy
+#~ msgid "Sending Email"
+#~ msgstr "Sendmail"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Configure Folder"
-msgstr "Конф╕╜урувати теку"
+#, fuzzy
+#~ msgid "Server Configuration"
+#~ msgstr "Конф╕╜урац╕я пошти"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Copy to Folder..."
-msgstr "Скоп╕ювати в теку..."
+#, fuzzy
+#~ msgid "Server Type: "
+#~ msgstr "Сервер:"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Edit Message"
-msgstr "Виправити пов╕домлення"
+#, fuzzy
+#~ msgid "Servers"
+#~ msgstr "Сервер:"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Expunge"
-msgstr ""
+#~ msgid "Signature file:"
+#~ msgstr "Файл п╕дпису:"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Filter on Subject"
-msgstr "Ф╕льтр теми"
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Файл п╕дпису:"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Forward"
-msgstr "Переслати"
+#~ msgid "Sources"
+#~ msgstr "Джерела"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
-msgid "_Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#, fuzzy
+#~ msgid "Type"
+#~ msgstr "Тип:"
 
-#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration..."
-msgstr "Конф╕╜урац╕я пошти"
+#~ msgid "User Information"
+#~ msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Message"
-msgstr "Пов╕домлення"
+#~ msgid "Username:"
+#~ msgstr "Назва користувача:"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Move to Folder..."
-msgstr "Перенести в теку..."
+#, fuzzy
+#~ msgid "minute(s)"
+#~ msgstr "хвилина"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
+#~ msgid "Full name:"
+#~ msgstr "Повна назва:"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Print Message"
-msgstr "Надрукувати пов╕домлення"
+#~ msgid "Email address:"
+#~ msgstr "Електронна адреса:"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Save Message As..."
-msgstr "Зберегти пов╕домлення як..."
+#~ msgid "Signature File"
+#~ msgstr "Файл п╕дпису"
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "Джерело"
+#~ msgid "Server:"
+#~ msgstr "Сервер:"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Threaded"
-msgstr ""
+#~ msgid "Detect supported types..."
+#~ msgstr "Визначити типи, що п╕дтримуються..."
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Undelete"
-msgstr "В╕дновити"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Не видаляти пов╕домлення з сервера"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_VFolder on Subject"
-msgstr "В╕ртуальна тека теми"
+#~ msgid "Mail source type:"
+#~ msgstr "Тип джерела пошти:"
 
-#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor..."
-msgstr "Редактор в╕ртуальних тек"
+#~ msgid "News source type:"
+#~ msgstr "Новий тип телефона"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-message-composer.xml.h:6
-msgid "Attach"
-msgstr "Долучити"
+#~ msgid "Add Source"
+#~ msgstr "Додати джерело"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Close the current file"
-msgstr "Закрити поточний файл"
+#~ msgid "Edit Source"
+#~ msgstr "Виправити джерело"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Encrypt this message with PGP"
-msgstr "Зашифрувати це пов╕домлення PGP"
+#~ msgid "Add News Server"
+#~ msgstr "Додати сервер новин"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "HTML"
-msgstr "HTML"
+#~ msgid "Edit News Server"
+#~ msgstr "Виправити сервер новин"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "Insert a file as text into the message"
-msgstr "Вставити файл як текст у пов╕домлення"
+#~ msgid "Testing \"%s\""
+#~ msgstr "Перев╕рка \"%s\""
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "Insert text file..."
-msgstr "Вставити текстовий файл..."
+#~ msgid "The connection was successful!"
+#~ msgstr "З'╓днання усп╕шне!"
 
-#: ui/evolution-message-composer.xml.h:16
-msgid "Open a file"
-msgstr "В╕дкрити файл"
+#~ msgid "Address"
+#~ msgstr "Адреса"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "PGP Encrypt"
-msgstr "Шифрування PGP"
+#~ msgid "Mail Sources"
+#~ msgstr "Поштов╕ джерела"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "PGP Sign"
-msgstr "П╕дпис PGP"
+#, fuzzy
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Зберегти як"
+#~ msgid "News Servers"
+#~ msgstr "Сервери новин"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Зберегти в тец╕..."
+#~ msgid "News Sources"
+#~ msgstr "Джерела новин"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save in folder..."
-msgstr "Зберегти в тец╕..."
+#~ msgid "Send messages in HTML format"
+#~ msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
 
-#: ui/evolution-message-composer.xml.h:25
-msgid "Save the current file with a different name"
-msgstr "Зберегти поточний файл з ╕ншою назвою"
+#~ msgid "Delete a contact"
+#~ msgstr "Стерти контакт"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Save the message in a specified folder"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+#~ msgid "Find"
+#~ msgstr "Знайти"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "В╕дправити"
+#~ msgid "Find a contact"
+#~ msgstr "Знайти контакт"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "В╕дправити п╕зн╕ше"
+#~ msgid "Print contacts"
+#~ msgstr "Надрукувати контакти"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "В╕дправити п╕зн╕ше"
+#~ msgid "Stop"
+#~ msgstr "Зупинити"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
-msgstr "В╕д╕слати пошту в формат╕ HTML"
+#~ msgid "Stop Loading"
+#~ msgstr "Зупинити завантаження"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
+#~ msgid "View All"
+#~ msgstr "Показати все"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send the message now"
-msgstr "В╕д╕слати пов╕домлення негайно"
+#~ msgid "View all contacts"
+#~ msgstr "Показати вс╕ контакти"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Send this message now"
-msgstr "Стерти це пов╕домлення негайно"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Конф╕╜урац╕я адресно╖ книги..."
 
-#: ui/evolution-message-composer.xml.h:34
-msgid "Show / hide attachments"
-msgstr "Показати / прибрати долучення"
+#~ msgid "_Print Contacts..."
+#~ msgstr "Надрукувати контакти..."
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Show _attachments"
-msgstr "Показати долучення"
+#~ msgid "_Search for contacts"
+#~ msgstr "Пошук контакт╕в"
 
-#: ui/evolution-message-composer.xml.h:36
-msgid "Show attachments"
-msgstr "Показати долучення"
+#~ msgid "5 Days"
+#~ msgstr "5 Дн╕в"
 
-#: ui/evolution-message-composer.xml.h:37
-msgid "Sign this message with your PGP key"
-msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
+#~ msgid "Ca_lendar"
+#~ msgstr "Календар"
 
-#: ui/evolution-message-composer.xml.h:44
-msgid "_Insert text file... (FIXME)"
-msgstr "Вставити текстовий файл..."
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Параметри календаря..."
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "В╕дкрити..."
+#~ msgid "Create a new appointment"
+#~ msgstr "Створити нову зустр╕ч"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Security"
-msgstr ""
+#~ msgid "Create a new calendar"
+#~ msgstr "Створити новий календар"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution-subscribe.xml.h:6
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
+#~ msgid "Go back in time"
+#~ msgstr "Перейти назад в час╕"
 
-#: ui/evolution-subscribe.xml.h:9
-msgid "Refresh List"
-msgstr "Оновити список"
+#~ msgid "Go forward in time"
+#~ msgstr "Перейти вперед в час╕"
 
-#: ui/evolution-subscribe.xml.h:10
-msgid "Refresh List of Folders"
-msgstr "Оновити список тек"
+#~ msgid "Go to"
+#~ msgstr "Перейти"
 
-#: ui/evolution-subscribe.xml.h:11
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+#~ msgid "Go to a specific date"
+#~ msgstr "Перейти до вказано╖ дати"
 
-#: ui/evolution-subscribe.xml.h:13
-msgid "Subscribe"
-msgstr ""
+#~ msgid "Go to present time"
+#~ msgstr "Поперейти в точний час"
 
-#: ui/evolution-subscribe.xml.h:14
-msgid "Unsubscribe"
-msgstr ""
+#~ msgid "Month"
+#~ msgstr "М╕сяць"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: ui/evolution.xml.h:6
-msgid "Display a different folder"
-msgstr "В╕добразити ╕ншу теку"
+#~ msgid "Open a calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "Prev"
+#~ msgstr "Повернутись"
+
+#~ msgid "Print this calendar"
+#~ msgstr "Надрукувати цей календар"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Зберегти календар як щось ╕нше"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Показати 1 день"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Показати 1 м╕сяць"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Показати 1 тиждень"
+
+#~ msgid "Show the working week"
+#~ msgstr "Показати робочий тиждень"
+
+#~ msgid "Week"
+#~ msgstr "Тиждень"
+
+#~ msgid "_New"
+#~ msgstr "Новий"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Надрукувати цей календар"
+
+#~ msgid "_Save As..."
+#~ msgstr "Зберегти як..."
+
+#~ msgid "Delete this item"
+#~ msgstr "Стерти цей елемент"
+
+#~ msgid "Delete..."
+#~ msgstr "Стерти..."
+
+#~ msgid "Help"
+#~ msgstr "Дов╕дка"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Надрукувати конверт..."
+
+#~ msgid "Print this item"
+#~ msgstr "Надрукувати цей елемент"
+
+#~ msgid "Print..."
+#~ msgstr "Друкувати..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Зберегти як..."
+
+#~ msgid "Save and Close"
+#~ msgstr "Зберегти та закрити"
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Зберегти контакт ╕ закрити д╕алог"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "В╕д╕слати контакт ╕ншому..."
+
+#~ msgid "_File"
+#~ msgstr "Файл"
+
+#~ msgid "_Print..."
+#~ msgstr "Друкувати..."
+
+#~ msgid "_Save"
+#~ msgstr "Зберегти"
+
+#~ msgid "About this application"
+#~ msgstr "Про цю програму"
+
+#~ msgid "About..."
+#~ msgstr "Про..."
+
+#~ msgid "C_lear"
+#~ msgstr "Очистити"
+
+#~ msgid "C_ut"
+#~ msgstr "Вир╕зати"
+
+#~ msgid "Clear"
+#~ msgstr "Очистити"
 
-#: ui/evolution.xml.h:7
-msgid "E_xit"
-msgstr "Вийти"
+#~ msgid "Clear the selection"
+#~ msgstr "Очистити вибране"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Закрити цю зустр╕ч"
+
+#~ msgid "Copy"
+#~ msgstr "Скоп╕ювати"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Скоп╕ювати вибране"
+
+#~ msgid "Cut"
+#~ msgstr "Вир╕зати"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Вир╕зати вибране"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "Адресна книга..."
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Вставити файл"
+
+#~ msgid "Find Again"
+#~ msgstr "Шукати дал╕"
+
+#~ msgid "Find _Again"
+#~ msgstr "Шукати дал╕"
+
+#~ msgid "N_ext"
+#~ msgstr "Наступний"
+
+#~ msgid "Paste"
+#~ msgstr "Вставити"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Вставити буфер обм╕ну"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Параметри друку..."
+
+#~ msgid "Print Setup"
+#~ msgstr "Параметри друку"
+
+#~ msgid "Properties"
+#~ msgstr "Властивост╕"
+
+#~ msgid "Redo"
+#~ msgstr "Повторити"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Повторити в╕дм╕нену д╕ю"
+
+#~ msgid "Replace"
+#~ msgstr "Зам╕нити"
+
+#~ msgid "Replace a string"
+#~ msgstr "Зам╕нити рядок"
+
+#~ msgid "Save the current file"
+#~ msgstr "Зберегти поточний файл"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Планування зустр╕ч╕"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Планувати зустр╕ч"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Шукати зновуй той же рядок"
+
+#~ msgid "Search for a string"
+#~ msgstr "Пошук рядка"
+
+#~ msgid "Select All"
+#~ msgstr "Вибрати все"
 
-#: ui/evolution.xml.h:8
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
+#~ msgid "Select everything"
+#~ msgstr "Вибрати назви"
+
+#~ msgid "Undo"
+#~ msgstr "В╕дм╕нити"
+
+#~ msgid "Undo the last action"
+#~ msgstr "В╕дм╕нити останню операц╕ю"
+
+#~ msgid "_About..."
+#~ msgstr "Про..."
+
+#~ msgid "_Close"
+#~ msgstr "Закрити"
+
+#~ msgid "_Copy"
+#~ msgstr "Скоп╕ювати"
+
+#~ msgid "_Edit"
+#~ msgstr "Редагування"
+
+#~ msgid "_Find..."
+#~ msgstr "Знайти..."
+
+#~ msgid "_Help"
+#~ msgstr "Дов╕дка"
+
+#~ msgid "_Paste"
+#~ msgstr "Вставити"
+
+#~ msgid "_Print"
+#~ msgstr "Друкувати"
+
+#~ msgid "_Properties..."
+#~ msgstr "Властивост╕..."
+
+#~ msgid "_Redo"
+#~ msgstr "Повторити"
+
+#~ msgid "_Replace..."
+#~ msgstr "Зам╕нити..."
+
+#~ msgid "_Undo"
+#~ msgstr "В╕дм╕нити"
+
+#~ msgid "Compose"
+#~ msgstr "П╕дготувати"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Скласти нове пов╕домлення"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Скоп╕ювати пов╕домлення у нову теку"
+
+#~ msgid "F_older"
+#~ msgstr "Тека"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Ф╕льтр в╕дправника"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Ф╕льтр отримувач╕в"
+
+#~ msgid "Forget _Passwords"
+#~ msgstr "Забути парол╕"
+
+#~ msgid "Get Mail"
+#~ msgstr "Отримати пошту"
+
+#~ msgid "Hide _Deleted messages"
+#~ msgstr "Прибрати стерт╕ пов╕домлення"
+
+#~ msgid "Hide _Read messages"
+#~ msgstr "Прибрати прочитан╕ пов╕домлення"
+
+#~ msgid "Hide _Selected messages"
+#~ msgstr "Прибрати вибран╕ пов╕домлення"
+
+#~ msgid "Mail _Filters..."
+#~ msgstr "Поштов╕ ф╕льтри..."
+
+#, fuzzy
+#~ msgid "Manage Subscriptions..."
+#~ msgstr "Опис:"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Позначити як прочитане"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Позначити як непрочитане"
+
+#~ msgid "Move"
+#~ msgstr "Перенести"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Перенести пов╕домлення у нову теку"
+
+#~ msgid "Previews the message to be printed"
+#~ msgstr "Переглянути пов╕домлення, що буде надрукувано"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Перегляд друку пов╕домлення..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Надрукувати пов╕домлення на принтер╕"
+
+#~ msgid "Print message..."
+#~ msgstr "Надрукувати пов╕домлення..."
 
-#: ui/evolution.xml.h:9
-msgid "Exit the program"
-msgstr "Вийти з програми"
+#~ msgid "Reply to _All"
+#~ msgstr "В╕дпов╕сти вс╕м"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "В╕дпов╕сти в╕дправнику"
+
+#~ msgid "Select _All"
+#~ msgstr "Вибрати все"
+
+#~ msgid "Send queued mail and retrieve new mail"
+#~ msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+
+#~ msgid "Show _All messages"
+#~ msgstr "Показати вс╕ пов╕домлення"
 
-#: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Час початку зустр╕ч╕:"
+#~ msgid "Threaded Message list"
+#~ msgstr "Переслати це пов╕домлення"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "В╕ртуальна тека в╕дправника"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "В╕ртуальна тека отримувач╕в"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Застосувати ф╕льтри"
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "Скоп╕ювати в теку..."
 
-#: ui/evolution.xml.h:11
-msgid "Show information about Evolution"
-msgstr "Показати ╕нформац╕ю про Evolution"
+#~ msgid "_Edit Message"
+#~ msgstr "Виправити пов╕домлення"
 
-#: ui/evolution.xml.h:12
-msgid "Show the _Folder Bar"
-msgstr "Показати панель тек"
+#~ msgid "_Filter on Subject"
+#~ msgstr "Ф╕льтр теми"
+
+#~ msgid "_Forward"
+#~ msgstr "Переслати"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "╤нвертувати виб╕р"
 
-#: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Конф╕╜урац╕я пошти"
 
-#: ui/evolution.xml.h:14
-msgid "Submit _Bug Report"
-msgstr "В╕д╕слати зв╕т про помилку"
+#~ msgid "_Message"
+#~ msgstr "Пов╕домлення"
 
-#: ui/evolution.xml.h:15
-msgid "Submit bug report using Bug Buddy."
-msgstr "В╕д╕слати зв╕т про помилку використовуючи Bug Buddy"
+#~ msgid "_Move to Folder..."
+#~ msgstr "Перенести в теку..."
 
-#: ui/evolution.xml.h:16
-msgid "Toggle whether to show the folder bar"
-msgstr "Перемикнути стан показу панел╕ тек"
+#~ msgid "_Open in New Window"
+#~ msgstr "В╕дкрити у новому в╕кн╕"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#~ msgid "_Print Message"
+#~ msgstr "Надрукувати пов╕домлення"
 
-#: ui/evolution.xml.h:18
-msgid "Using the C_ontact Manager"
-msgstr ""
+#~ msgid "_Save Message As..."
+#~ msgstr "Зберегти пов╕домлення як..."
 
-#: ui/evolution.xml.h:19
-msgid "Using the _Calendar"
-msgstr "Використання календаря"
+#~ msgid "_Source"
+#~ msgstr "Джерело"
 
-#: ui/evolution.xml.h:20
-msgid "Using the _Mailer"
-msgstr "Використання поштово╖ програми"
+#~ msgid "_Undelete"
+#~ msgstr "В╕дновити"
 
-#: ui/evolution.xml.h:21
-msgid "_About Evolution..."
-msgstr "Про Evolution..."
+#~ msgid "_VFolder on Subject"
+#~ msgstr "В╕ртуальна тека теми"
 
-#: ui/evolution.xml.h:22
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
+#, fuzzy
+#~ msgid "_Virtual Folder Editor..."
+#~ msgstr "Редактор в╕ртуальних тек"
 
-#: ui/evolution.xml.h:23
-msgid "_Contact (FIXME)"
-msgstr "Контакт"
+#~ msgid "Attach"
+#~ msgstr "Долучити"
 
-#: ui/evolution.xml.h:26
-msgid "_Folder"
-msgstr "Тека"
+#~ msgid "Close the current file"
+#~ msgstr "Закрити поточний файл"
 
-#: ui/evolution.xml.h:27
-msgid "_Go to Folder..."
-msgstr "Перейти на теку..."
+#~ msgid "Encrypt this message with PGP"
+#~ msgstr "Зашифрувати це пов╕домлення PGP"
 
-#: ui/evolution.xml.h:29
-msgid "_Index"
-msgstr "Покажчик"
+#~ msgid "HTML"
+#~ msgstr "HTML"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr ""
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Вставити файл як текст у пов╕домлення"
 
-#: ui/evolution.xml.h:32
-msgid "_Settings"
-msgstr "Установки"
+#~ msgid "Insert text file..."
+#~ msgstr "Вставити текстовий файл..."
 
-#: ui/evolution.xml.h:33
-msgid "_Task (FIXME)"
-msgstr "Завдання"
+#~ msgid "Open a file"
+#~ 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:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+#~ msgid "PGP Encrypt"
+#~ msgstr "Шифрування PGP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#~ msgid "PGP Sign"
+#~ msgstr "П╕дпис PGP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Зайнятий"
+#~ msgid "Save As"
+#~ msgstr "Зберегти як"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "За межами оф╕су"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Зберегти в тец╕..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Нема╓ ╕нформац╕╖"
+#~ msgid "Save in folder..."
+#~ msgstr "Зберегти в тец╕..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "Запросити ╕нших..."
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Зберегти поточний файл з ╕ншою назвою"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "Параметри"
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+#~ msgid "Send"
+#~ msgstr "В╕дправити"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#~ msgid "Send _Later"
+#~ msgstr "В╕дправити п╕зн╕ше"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#~ msgid "Send _later"
+#~ msgstr "В╕дправити п╕зн╕ше"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "В╕д╕слати пошту в формат╕ HTML"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "Автовиб╕р"
+#~ msgid "Send the message later"
+#~ msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr "_>>"
+#~ msgid "Send the message now"
+#~ msgstr "В╕д╕слати пов╕домлення негайно"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "Вс╕ люди ╕ ресурси"
+#~ msgid "Send this message now"
+#~ msgstr "Стерти це пов╕домлення негайно"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Вс╕ люди ╕ один ресурс"
+#~ msgid "Show / hide attachments"
+#~ msgstr "Показати / прибрати долучення"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Потр╕бн╕ люди"
+#~ msgid "Show _attachments"
+#~ msgstr "Показати долучення"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Потр╕бн╕ люди ╕ один ресурс"
+#~ msgid "Sign this message with your PGP key"
+#~ msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Час початку з╕брання:"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Вставити текстовий файл..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Час завершення з╕брання:"
+#~ msgid "_Open..."
+#~ msgstr "В╕дкрити..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Весь супров╕д"
+#~ msgid "Refresh List"
+#~ msgstr "Оновити список"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "ПВСЧПСН"
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Оновити список тек"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Display a different folder"
+#~ msgstr "В╕добразити ╕ншу теку"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "E_xit"
+#~ msgstr "Вийти"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "зараз"
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution - %s"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Exit the program"
+#~ msgstr "Вийти з програми"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Час початку зустр╕ч╕:"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Група %i"
+#~ msgid "Show information about Evolution"
+#~ msgstr "Показати ╕нформац╕ю про Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Показати панель тек"
+
+#~ msgid "Submit _Bug Report"
+#~ msgstr "В╕д╕слати зв╕т про помилку"
+
+#~ msgid "Submit bug report using Bug Buddy."
+#~ msgstr "В╕д╕слати зв╕т про помилку використовуючи Bug Buddy"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Перемикнути стан показу панел╕ тек"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Використання календаря"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Використання поштово╖ програми"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "Про Evolution..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Зустр╕ч"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Контакт"
+
+#~ msgid "_Folder"
+#~ msgstr "Тека"
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "Перейти на теку..."
+
+#~ msgid "_Index"
+#~ msgstr "Покажчик"
+
+#~ msgid "_Settings"
+#~ msgstr "Установки"
 
-#~ msgid "categories"
-#~ msgstr "категор╕╖"
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Завдання"
 
 #~ msgid "Available Categories:"
 #~ msgstr "Доступн╕ категор╕╖:"