Added Azeri language file

fixed various po files
fixed a no-c-format tag

svn path=/trunk/; revision=8733

20 files changed, 49483 insertions, 24184 deletions

diff --git a/configure.in b/configure.in
index 541c3b05a1..7719241d92 100644
--- a/configure.in
+++ b/configure.in
@@ -63,8 +63,7 @@ AC_MSG_ERROR(gnome-libs 1.2.9 or higher is required.)])
 CFLAGS=$CFLAGS_save
 LIBS=$LIBS_save
 
-ALL_LINGUAS="ca da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ru sk sl sv tr uk"
-
+ALL_LINGUAS="az ca da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt pt_BR ru sk sl sv tr uk"
 AM_GNOME_GETTEXT
 localedir='$(prefix)/$(DATADIRNAME)/locale'
 AC_SUBST(localedir)
diff --git a/po/ChangeLog b/po/ChangeLog
index 2c7752ccc4..6977640da1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-15  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* az.po: Added Azeri file
+	* {es,fi,fr,ga,hu,nl,nn,no,sk,sl,sv}.po: corrected headers
+	and/or syntax errrors
+
 2001-03-15  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/az.po b/po/az.po
new file mode 100644
index 0000000000..ef1f37f922
--- /dev/null
+++ b/po/az.po
@@ -0,0 +1,9647 @@
+# -------------------------------------------------------
+# Copyright (C) 2000 Free Software Foundation, Inc.
+# Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution 0.3.1\n"
+"POT-Creation-Date: 2001-03-15 11:05+0100\n"
+"PO-Revision-Date: 2000-03-01 10:53+0200\n"
+"Last-Translator: Vasif Ismailoglu MD <azerb_linux@hotmail.com>\n"
+"Language-Team: Azerbaijani Turkish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid "Card: "
+msgstr "Kart: "
+
+#: addressbook/backend/ebook/e-card.c:3055
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"Ad: "
+
+#: addressbook/backend/ebook/e-card.c:3056
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+"\n"
+"  Prefiks:\t"
+
+#: addressbook/backend/ebook/e-card.c:3057
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+"\n"
+"  Verilən:\t"
+
+#: addressbook/backend/ebook/e-card.c:3058
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+"\n"
+"  Əlavə: "
+
+#: addressbook/backend/ebook/e-card.c:3059
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+"\n"
+"  Ailə:\t"
+
+#: addressbook/backend/ebook/e-card.c:3060
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+"\n"
+"  Suffiks:\t"
+
+#: addressbook/backend/ebook/e-card.c:3074
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"Ad günü:  "
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"Ünvan:"
+
+#: addressbook/backend/ebook/e-card.c:3087
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+"\n"
+"   Poçt Qutusu:\t"
+
+#: addressbook/backend/ebook/e-card.c:3088
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+"\n"
+"   Ext:\t"
+
+#: addressbook/backend/ebook/e-card.c:3089
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+"\n"
+"   Küçə:\t"
+
+#: addressbook/backend/ebook/e-card.c:3090
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+"\n"
+"   Şəhər:\t"
+
+#: addressbook/backend/ebook/e-card.c:3091
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+"\n"
+"   Rayon:\t"
+
+#: addressbook/backend/ebook/e-card.c:3092
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+"\n"
+"   Poçt Kodu:\t"
+
+#: addressbook/backend/ebook/e-card.c:3093
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"   ölkə:\t"
+
+#: addressbook/backend/ebook/e-card.c:3106
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+"\n"
+"Təslim Etiketi:  "
+
+#: addressbook/backend/ebook/e-card.c:3118
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+"\n"
+"Telefonlar:\n"
+
+#: addressbook/backend/ebook/e-card.c:3121
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+"\n"
+"Telefon:"
+
+#: addressbook/backend/ebook/e-card.c:3145
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"ePoçt:\n"
+
+#: addressbook/backend/ebook/e-card.c:3148
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"ePoçt:"
+
+#: addressbook/backend/ebook/e-card.c:3167
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+"\n"
+"Göndərici:  "
+
+#: addressbook/backend/ebook/e-card.c:3173
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+"\n"
+"Zaman zolağı:  "
+
+#: addressbook/backend/ebook/e-card.c:3181
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+"\n"
+"Coğrafi Yerləşmə:  "
+
+#: addressbook/backend/ebook/e-card.c:3185
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+"\n"
+"Məslək:\t"
+
+#: addressbook/backend/ebook/e-card.c:3197
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+"\n"
+"Quruluş:\t"
+
+#: addressbook/backend/ebook/e-card.c:3198
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+"   Ad:\t"
+
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+"\n"
+"   Bölmə:\t"
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+"\n"
+"   Bölmə2:\t"
+
+#: addressbook/backend/ebook/e-card.c:3201
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+"\n"
+"   Bölmə3:\t"
+
+#: addressbook/backend/ebook/e-card.c:3202
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+"\n"
+"   Bölmə4:\t"
+
+#: addressbook/backend/ebook/e-card.c:3206
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"Kateqoriyalar:\t"
+
+#: addressbook/backend/ebook/e-card.c:3207
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+"\n"
+"İzahat:\t"
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3220
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+"\n"
+"Yeganə Kəlimə:\t"
+
+#: addressbook/backend/ebook/e-card.c:3223
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+"\n"
+"Ümumi Açar:\t"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
+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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "Bonoboyu başlada bilmədim"
+
+#: addressbook/conduit/address-conduit.c:201
+msgid "Cursor could not be loaded\n"
+msgstr "Ox yüklənə bilmədi\n"
+
+#: addressbook/conduit/address-conduit.c:214
+msgid "EBook not loaded\n"
+msgstr "eKitab yüklənmədi\n"
+
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
+msgid "Could not start wombat server"
+msgstr "Wombat xidməti başladıla bilmədi"
+
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
+msgid "Could not start wombat"
+msgstr "Wombatı başlada bilmədim"
+
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
+msgid "Could not read pilot's Address application block"
+msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
+
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
+msgstr "Əlavə Et"
+
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "_İl dönümü :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "_Məslək"
+
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "Məsləki _Faks"
+
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "_Əlaqələr ..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Nö_vlər..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
+msgid "Contact Editor"
+msgstr "Əlaqə düzəldicisi"
+
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Ətraflı"
+
+#: addressbook/contact-editor/contact-editor.glade.h:9
+msgid "File As:"
+msgstr "Fərqli fayllalə:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "Ümumi"
+
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Yeni telefon növü"
+
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "_Qeydlər:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Telefon Növləri"
+
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Primary Email"
+msgstr "İlk ePoçt ünvanı"
+
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "_HTML ePoçtlarını qəbul edir"
+
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Web səhifəsi :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "_Əlavə Et"
+
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Ünvan..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "_Köməkçi adı :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "_Ad günü :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "_Məslək"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
+msgid "_Company:"
+msgstr "Ş_irkət :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_Sil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
+msgstr "_Bölmə :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "_Tam Ad ..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Ev"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "Məslək _izahı:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "_İdarəcinin Adı :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Cib"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "_Ləqəb :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
+msgstr "_İdarə :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
+msgstr "_Məslək :"
+
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
+msgstr "_Yoldaş:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "_Bu ePoçt ünvanıdır"
+
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Əlaqəni Silim mi?"
+
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "Bu kateqoriyalara ait olan üzvlər :"
+
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
+msgid "Assistant"
+msgstr "Köməkçi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
+msgid "Business"
+msgstr "Məslək"
+
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
+msgid "Business 2"
+msgstr "2.nci Məslək"
+
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Business Fax"
+msgstr "Məsləki Faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1233
+msgid "Callback"
+msgstr "Geri axtarma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Car"
+msgstr "Maşın"
+
+#: addressbook/contact-editor/e-contact-editor.c:1235
+msgid "Company"
+msgstr "Şirkət"
+
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Home 2"
+msgstr "2.nci ev"
+
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Home Fax"
+msgstr "Ev faksı"
+
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Mobile"
+msgstr "Cib telefonu"
+
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+msgid "Other"
+msgstr "Başqa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1242
+msgid "Other Fax"
+msgstr "Başqa faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Pager"
+msgstr "Peycer"
+
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
+msgid "Primary"
+msgstr "İlk"
+
+#: addressbook/contact-editor/e-contact-editor.c:1245
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1246
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1247
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
+msgid "Email 2"
+msgstr "2.nci ePoçt ünvanı"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
+msgid "Email 3"
+msgstr "3.ncü ePoçt ünvanı"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Süzgəcləri Düzəlt"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Tam Ad:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "ePoçt"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Ünvan _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Canada"
+msgstr "Təqvim"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr "Ünvanı Yoxla"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+#, fuzzy
+msgid "Countr_y:"
+msgstr ""
+"\n"
+"   ölkə:\t"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finlandiya"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Ünvan :"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_Şəhər:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
+msgstr "Tam adı yoxla"
+
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
+#, fuzzy
+msgid "I"
+msgstr "Əgər"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "dir(dır)"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Ad :"
+
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Soyad :"
+
+#: addressbook/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "_Orta ad:"
+
+#: addressbook/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "_Suffiks:"
+
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "B_aşlıq:"
+
+#: addressbook/gui/component/addressbook.c:237
+msgid "As _Minicards"
+msgstr "_Balaca kartlar olaraq"
+
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
+msgid "As _Table"
+msgstr "_Cədvəl olaraq"
+
+#: addressbook/gui/component/addressbook.c:412
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s üçün parol girin"
+
+#: addressbook/gui/component/addressbook.c:440
+msgid "Unable to open addressbook"
+msgstr "Ünvan dəftərini aça bilmədim"
+
+#: addressbook/gui/component/addressbook.c:445
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or have tried\n"
+"to access an LDAP server and don't have LDAP support\n"
+"compiled in.  If you've entered a URI, check the URI for\n"
+"correctness and reenter.  If not, you probably have\n"
+"attempted to access an LDAP server.  If you wish to be\n"
+"able to use LDAP, you'll need to download and install\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+"Bu ünvan dəftərini aça bilmədik. Bu ya səhv bir\n"
+"URI'nin bildirilməsindən ötrü ya da LDAP dəstəyi \n"
+"olmayan bir vericiyə çatmaq istəməsindən ötrüdür.\n"
+"Bir URI bildirdin isə, URI'nin düz olduğunu yoxla və\n"
+"yenə sına. Bir URI bildirimədin isə, bir LDAP vericisinə\n"
+"çatmaq istədin. LDAp'ı istifadə etmək istəyirsənsə , OpenLDAPi(ı)\n"
+"qurub, Evolution'u təzədən yoxlayıb təzədən qurmaq "
+"məcburiyyətindəsən.\n"
+
+#: addressbook/gui/component/addressbook.c:568
+msgid "Show All"
+msgstr "Hamısını Göstər"
+
+#: addressbook/gui/component/addressbook.c:570
+msgid "Advanced..."
+msgstr "Ətraflı..."
+
+#: addressbook/gui/component/addressbook.c:600
+msgid "Any field contains"
+msgstr "Daxil edən hər hansı üzv"
+
+#: addressbook/gui/component/addressbook.c:601
+msgid "Name contains"
+msgstr "Ad daxil edən"
+
+#: addressbook/gui/component/addressbook.c:602
+msgid "Email contains"
+msgstr "ePoçt daxil edən"
+
+#: addressbook/gui/component/addressbook.c:745
+msgid "The URI that the Folder Browser will display"
+msgstr "Qovluq Səyyahını göstərəcək olan URI"
+
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
+msgstr "Digər Əlaqələr"
+
+#: addressbook/gui/component/addressbook-config.c:143
+msgid "LDAP Server"
+msgstr "LDAP Vericisi"
+
+#: addressbook/gui/component/addressbook-config.c:145
+msgid "File"
+msgstr "Fayl"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "Unknown addressbook type"
+msgstr "Namə'lum ünvan dəftəri"
+
+#: addressbook/gui/component/addressbook-config.c:158
+msgid "None (anonymous mode)"
+msgstr "Heç biri (adsız halı)"
+
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:145
+msgid "Password"
+msgstr "Parol"
+
+#: addressbook/gui/component/addressbook-config.c:162
+msgid "SASL"
+msgstr "SASL"
+
+#: addressbook/gui/component/addressbook-config.c:165
+msgid "Unknown auth type"
+msgstr "Namə'lum tanıtma növü"
+
+#: addressbook/gui/component/addressbook-config.c:174
+msgid "Base"
+msgstr "Əsas"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "One"
+msgstr "Bir"
+
+#: addressbook/gui/component/addressbook-config.c:178
+msgid "Subtree"
+msgstr "Alt Ağac"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Unknown scope type"
+msgstr "Namə'lum hərəkət növü"
+
+#: addressbook/gui/component/addressbook-config.c:348
+msgid "Bind DN:"
+msgstr "Cild DN:"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
+msgid "Remember this password"
+msgstr "Bu parlu yadda saxla"
+
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
+msgid "Host:"
+msgstr "Ev Sahibi:"
+
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "Port:"
+msgstr "Qapı:"
+
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
+msgid "Root DN:"
+msgstr "Kök DN :"
+
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
+msgid "Search Scope:"
+msgstr "Axtarış Hərəkəti ..."
+
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
+msgid "Authentication:"
+msgstr "Tanıtma :"
+
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+msgid "Path:"
+msgstr "Yol:"
+
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
+msgid "Create path if it doesn't exist."
+msgstr "Belə bir yol yoxdursa yarat."
+
+#: addressbook/gui/component/addressbook-config.c:642
+msgid "Edit Addressbook"
+msgstr "Ünvan dəftərini düzəlt"
+
+#: addressbook/gui/component/addressbook-config.c:644
+msgid "Add Addressbook"
+msgstr "Ünvan dəftəri əlavə et"
+
+#: addressbook/gui/component/addressbook-config.c:660
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Sahib olduğunuz ünvan dəftəri nçvünü seçin, bunu haqqında lazımi "
+"mə'lumatları bildirin."
+
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
+msgid "Name:"
+msgstr "Ad :"
+
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
+msgid "Description:"
+msgstr "İzah :"
+
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr "Ünvan Dəftəri Qaynağı"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Düzəlt"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+msgid "Name"
+msgstr "Ad"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Digər Əlaqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolirion ünvan dəftəri üçün quraşdırma vasitəsi.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Ünvan Dəftəri"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Ünvan dəftəri üçün buraya tıqla"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution Ünvan Dəftəri"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Tap..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr "Alıcılar Siyahısı :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select Names"
+msgstr "Ad Seç"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select name from:"
+msgstr "ADı buradan seç"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+msgid "Search"
+msgstr "Axtar"
+
+#: 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:481
+#: addressbook/gui/widgets/e-minicard.c:435
+msgid "Save as VCard"
+msgstr "VCard olaraq qeyd et"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:579
+msgid "Email"
+msgstr "ePoçt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Organization"
+msgstr "Şirkət"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:595
+msgid "Web Site"
+msgstr "Web Səhifəsi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:596
+msgid "Department"
+msgstr "Bölmə"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:597
+msgid "Office"
+msgstr "İdarə"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:598
+msgid "Title"
+msgstr "Başlıq"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:599
+msgid "Profession"
+msgstr "Məslək"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:600
+msgid "Manager"
+msgstr "İdarəci"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Nickname"
+msgstr "Ləqəb"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+msgid "Spouse"
+msgstr "Yoldaş"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+msgid "Note"
+msgstr "Qeyd"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+msgid "Free-busy URL"
+msgstr "Sərbəst/məşğul URL"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
+msgid "Save in addressbook"
+msgstr "Ünvan dəftərinə qeyd et"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Bu görünüşdə göstəriləcək üzvlər yoxdur\n"
+"\n"
+"Buraya cüt-tıqlayaraq bir əlaqə üzvünü yarat."
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Kart: "
+
+#: 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 "Sonunda boş formlar olsun :"
+
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "İçindəkilər"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Alt :"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Ölçülər :"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Yazı növü ..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Yazı növləri"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "Axırıncı :"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Şəkil"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Başlıq"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Başlıq/axırıncı"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Başlıqlar"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "Hər bir məktub üçün üst yazı"
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Hündürlük :"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr "Arxa arxaya"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr "Daxil et :"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Mənzərə"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Sol :"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Məktub tab'lərini bir tərəfə yığ"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Kənarlar"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "Sütunların miqdarı :"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Seçənəklər"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "İstiqamət"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Səhifə"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Səhifə _Quruluşu"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Kağız"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Kağız qaynağı :"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Portret"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Nümayiş :"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Boz kölgələməyi işlədərk yazdır"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Ikili səhifələri tərs çevir"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Sağ :"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Bölmələr :"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Kölgələmə"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr "Böyüklük :"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Yeni bir səhifə ilə başla"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Tərz adı :"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Üst :"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Növ:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "En :"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
+
+#: calendar/gui/calendar-commands.c:233
+msgid "File not found"
+msgstr "Fayl tapıla bilmədi"
+
+#: calendar/gui/calendar-commands.c:257
+msgid "Open calendar"
+msgstr "Təqvimi aç"
+
+#: calendar/gui/calendar-commands.c:299
+msgid "Save calendar"
+msgstr "Təqvimi qeyd et"
+
+#: calendar/gui/calendar-commands.c:451
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF "
+"qurğularınızı yoxlayın."
+
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
+msgid "Public"
+msgstr "Ümumi"
+
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
+msgid "Private"
+msgstr "Şəxsi"
+
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
+msgid "Confidential"
+msgstr "Gizli"
+
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Unknown"
+msgstr "Namə'lum"
+
+#: calendar/gui/calendar-model.c:463
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:463
+msgid "S"
+msgstr "Baz."
+
+#: calendar/gui/calendar-model.c:465
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:465
+msgid "W"
+msgstr "Çərş."
+
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Yüksək"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Alçaq"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
+msgid "Transparent"
+msgstr "Şəffaf"
+
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
+msgid "Opaque"
+msgstr "Mat"
+
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+#, fuzzy
+msgid "Not Started"
+msgstr "Ne_cə Başlayaram"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+#, fuzzy
+msgid "Completed"
+msgstr "Bitirmə Tarixi:"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "Ləğv Et"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Tarix öz şəklində verilməlidir: \n"
+"\n"
+"%s"
+
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Yoxdur"
+
+#: calendar/gui/calendar-model.c:973
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Coğrafi yer bu şakildə bildirilməlidir: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/calendar-model.c:1013
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+"Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
+
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+#, fuzzy
+msgid "Recurring"
+msgstr "Təkrarlama"
+
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Qaynağı Seç"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "İndi"
+
+#: calendar/gui/calendar-summary.c:196
+msgid "%A, %e %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: calendar/gui/calendar-summary.c:437
+msgid "<b>Error loading calendar</b>"
+msgstr "<b>Təqvim yükləmə xətası</b>"
+
+#: calendar/gui/calendar-summary.c:449
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr "<b>Təqvim yükləmə xətası:<br>Bu yol dəstəklanmir"
+
+#: calendar/gui/calendar-summary.c:616
+msgid "Display"
+msgstr "Ekran"
+
+#: calendar/gui/calendar-summary.c:621
+msgid "Show appointments"
+msgstr "Görüşləri göstər"
+
+#: calendar/gui/calendar-summary.c:629
+msgid "Show tasks"
+msgstr "Vəzifələri göstər"
+
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Təqvim yüklənir"
+
+#: calendar/gui/control-factory.c:126
+msgid "The URI that the calendar will display"
+msgstr "Təqvimin göstərəcəyi URI"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "İclas bildiricisi "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Mürgülə"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Oldu"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "GNOME başladıla bilmədi"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%A %b %d %Y %H:%M'də bildir"
+
+#: 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'dəki iclas üçün bildiriş"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+msgid "No summary available."
+msgstr "Mündəricat yoxdur."
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "_Qapat"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 dəqiqə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 dəqiqə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 saat (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 dəqiqə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 saat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 dəqiqə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 dəqiqə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr "Zınqırovun səs kəsilməsi müddəti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "Audio Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Təqvim"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Təqvim Seçənəkləri"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Rənglər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr "Ətraflı"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr "Göstərmə Seçənəkləri :"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr "Uyğun Tarix"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr "Xəbardarlığı Fəallaşdır"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "Cüm"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "Cümə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr "İşarətlə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr "Bügunki İşlər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Items Due Today:"
+msgstr "Bügunki İşlər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "B.e"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Bazar ertəsi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr "Vaxtı Keçmiş İşlər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#, fuzzy
+msgid "Overdue Items:"
+msgstr "Vaxtı Keçmiş İşlər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Üstünlük"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Remind me of all appointments"
+msgstr "Bütün Görüşlərimi Bildir"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Reminders"
+msgstr "Göndərən"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "Şn"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "Şənbə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
+msgid "Show"
+msgstr "Hamısını Göstər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Görüşləri göstər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "Həftə Sayısını göstər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "Start of day:"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Baz"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Bazar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "Vəzifə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "C.a"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Cümə Axşamı"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr "Keçməsinə qədər qalan vaxt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr "Vaxt Dilimləri:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr "VAxt Şəkli:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Ç.a"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Çərşənbə axşamı"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr "Göstərişli Xəbərdarlıqlar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "Çər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "Çərşənbə"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr "İş Həftəsi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "saniyə."
+
+#: calendar/gui/dialogs/delete-comp.c:68
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Bu  `%s' görüşünü həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/delete-comp.c:77
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Bu `%s' vəzifəsini həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/delete-comp.c:86
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Bu `%s' jurnal girişini həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/delete-comp.c:89
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz mi?"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Dəyişiklikləri qeyd etmək istəyirsinizi mi?"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, fuzzy, no-c-format
+msgid "% Comp_lete:"
+msgstr "Bitirmə Tarixi:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Sinifləndirmələr"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "Göndərilmə tarixi"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr "Bitirmə Tarixi:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Xü_susi"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "Məslək"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Ümumi"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "Mü_ndəricat:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Vəzifə"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Confidential"
+msgstr "Gizli"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_Əlaqələr ..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr "_Bu \ttarixə qədər :"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Üstünlük:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_Hal:"
+
+#: calendar/gui/dialogs/task-editor.c:689
+msgid "Edit Task"
+msgstr "Vəzifəni Düzəlt"
+
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+msgid "No summary"
+msgstr "Mündəricat yoxdur"
+
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#, c-format
+msgid "Appointment - %s"
+msgstr "İclas - %s"
+
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#, c-format
+msgid "Task - %s"
+msgstr "Vəzifə - %s"
+
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Jurnal üzvü - %s"
+
+#: calendar/gui/e-calendar-table.c:156
+msgid "Categories"
+msgstr "Kateqoriyalar"
+
+#: calendar/gui/e-calendar-table.c:158
+msgid "Completion Date"
+msgstr "Qurtarma Vaxtı"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "End Date"
+msgstr "Son Tarix"
+
+#: calendar/gui/e-calendar-table.c:160
+msgid "Start Date"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Geographical Position"
+msgstr "Çoğrafi Yerləşmə"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
+msgstr "Edilmiş nisbət"
+
+#: calendar/gui/e-calendar-table.c:165
+msgid "Summary"
+msgstr "Mündəricat"
+
+#: calendar/gui/e-calendar-table.c:166
+msgid "Transparency"
+msgstr "Şəffaf"
+
+#: calendar/gui/e-calendar-table.c:167
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:168
+msgid "Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/e-calendar-table.c:169
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Ünvan dəftəri üçün buraya tıqla"
+
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
+msgid "Mark Complete"
+msgstr "İşarətləmə qurtadı"
+
+#: calendar/gui/e-calendar-table.c:551
+msgid "Mark the task complete"
+msgstr "Vəifə qurtarmasını işarətlə"
+
+#: calendar/gui/e-calendar-table.c:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "Bu üzvü düzəlt ..."
+
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Vəzifəni Düzəlt"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Bu vəifəni sil"
+
+#: calendar/gui/e-calendar-table.c:560
+msgid "Delete the task"
+msgstr "Bu vəifəni sil"
+
+#: calendar/gui/e-day-view-time-item.c:516
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dəqiqə bölmələri"
+
+#. 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:271 calendar/gui/e-day-view.c:1274
+#: 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:275 calendar/gui/e-day-view.c:1288
+#: calendar/gui/e-week-view-main-item.c:330
+msgid "%a %d %b"
+msgstr "%a %b %d"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
+#: 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:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Yeni iclas ..."
+
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
+
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
+msgstr "Bu iclası sil"
+
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
+msgstr "Bu iclasın daşına bilməsinə imkan ver"
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "Bu hadisələri sil"
+
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
+msgstr "Bütün hadisələri sil"
+
+#: calendar/gui/e-itip-control.c:153
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Evolution faylları müvəffəqiyyətlə quruldu."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+msgid "I couldn't read your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Evolution faylları müvəffəqiyyətlə quruldu."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Təqvim Haqqında"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "sent"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Sil"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Girişimli"
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "_Təqvimi aç"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "Ləğv Et"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A %d %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Təqvim Vericisi"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Tarix"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Təqvim yüklənir"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Orqanizasiya"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+msgid "Sender"
+msgstr "Göndərən"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Mü_ndəricat:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+#, fuzzy
+msgid "date-start"
+msgstr "Gün başlangıçı :"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+#, fuzzy
+msgid "Attendee"
+msgstr "Bütün Ziyarətçilər"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Bütün Ziyarətçilər"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+#, fuzzy
+msgid "Attendees: "
+msgstr "Bütün Ziyarətçilər"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "Ləğv Et"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Maşın"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "İclas başlama saatı :"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Orqanizasiya"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+#, fuzzy
+msgid "Required Participant"
+msgstr "_Lazımi Adamlar"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "Cib telefonu"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+msgid "Status"
+msgstr "Hal"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
+msgid "All"
+msgstr "Hamısı"
+
+#: calendar/gui/e-tasks.c:154
+msgid "Category:"
+msgstr "Kateqoriyalar:"
+
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
+
+#: calendar/gui/e-tasks.c:309
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
+
+#. 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/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Bütün hadisələri sil"
+
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
+msgstr "İclaslar:"
+
+#: calendar/gui/event-editor-dialog.glade.h:4
+msgid "Appointment Basics"
+msgstr "Görüş Əsasları"
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
+msgstr "Xüsusi təkrarlama"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Xaric Tutulan"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
+msgstr "Düzəlts"
+
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr "Təkrarlama yoxudr"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Preview"
+msgstr "Nümayiş"
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr "Təkrarlama"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
+msgstr "Təkralama Qaydası"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Reminder"
+msgstr "Göndərən"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "%s a(ə) məktub göndər"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "_Qurğular"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "1 günü göstər"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr "Bəsit Təkrarlama"
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "Son Tarix"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+#, fuzzy
+msgid "_Start time:"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+#, fuzzy
+msgid "_Starting date:"
+msgstr "Başlama Tarixi"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "sonra"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "əvvəl"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "gün(lər)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "Bütün Görüşlərimi Bildir"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr "üçün"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "forever"
+msgstr "əvvəl"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "saatlar"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "minute(s)"
+msgstr "dəqiqə"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "ay(lar)"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "until"
+msgstr "Adsız"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr "həftə(lər)"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "il(lər)"
+
+#: calendar/gui/event-editor.c:371
+msgid "Edit Appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr "..da"
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "gün"
+
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr "...da (də)"
+
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr "."
+
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr "hadisələr"
+
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Bu görüşdə Evolutionun düzəldə bilməyəcəyi hallar var."
+
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "günlər"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "1 günü göstər"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "həftələr"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "2 həftəni öster"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "saatlar"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "saat"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "dəqiqələr"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "10 dəqiqə"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr " saniyələr"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr "saniyə"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Bütün Görüşlərimi Bildir"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Evolutionun Executive Summary parçasını başlada bilmədim ."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/gnome-cal.c:695
+#, c-format
+msgid "Could not open the folder in `%s'"
+msgstr "`%s'da(də) qovluq yarada bilmədim"
+
+#: calendar/gui/gnome-cal.c:706
+#, c-format
+msgid "The method required to open `%s' is not supported"
+msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
+
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "Aprel"
+
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "Avqust"
+
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "Dekabr"
+
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "Fevral"
+
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
+msgstr "Tarixə Get"
+
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Günə Get"
+
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
+msgstr "Yanvars"
+
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr "İyul"
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr "İyun"
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr "Mart"
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr "May"
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr "Noyabr"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr "Oktyabr"
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr "Sentyabr"
+
+#: calendar/gui/print.c:296
+msgid "1st"
+msgstr "1.nci"
+
+#: calendar/gui/print.c:296
+msgid "2nd"
+msgstr "2.nci"
+
+#: calendar/gui/print.c:296
+msgid "3rd"
+msgstr "3.ncü"
+
+#: calendar/gui/print.c:296
+msgid "4th"
+msgstr "4.ncü"
+
+#: calendar/gui/print.c:296
+msgid "5th"
+msgstr "5.nci"
+
+#: calendar/gui/print.c:297
+msgid "6th"
+msgstr "6.ncı"
+
+#: calendar/gui/print.c:297
+msgid "7th"
+msgstr "7.nci"
+
+#: calendar/gui/print.c:297
+msgid "8th"
+msgstr "8.nci"
+
+#: calendar/gui/print.c:297
+msgid "9th"
+msgstr "9.ncu"
+
+#: calendar/gui/print.c:297
+msgid "10th"
+msgstr "10.ncu"
+
+#: calendar/gui/print.c:298
+msgid "11th"
+msgstr "11.nci"
+
+#: calendar/gui/print.c:298
+msgid "12th"
+msgstr "12.nci"
+
+#: calendar/gui/print.c:298
+msgid "13th"
+msgstr "13.ncü"
+
+#: calendar/gui/print.c:298
+msgid "14th"
+msgstr "14.ncü"
+
+#: calendar/gui/print.c:298
+msgid "15th"
+msgstr "15.nci"
+
+#: calendar/gui/print.c:299
+msgid "16th"
+msgstr "16.ncı"
+
+#: calendar/gui/print.c:299
+msgid "17th"
+msgstr "17.nci"
+
+#: calendar/gui/print.c:299
+msgid "18th"
+msgstr "18.nci"
+
+#: calendar/gui/print.c:299
+msgid "19th"
+msgstr "19.ncu"
+
+#: calendar/gui/print.c:299
+msgid "20th"
+msgstr "20.nci"
+
+#: calendar/gui/print.c:300
+msgid "21st"
+msgstr "21.nci"
+
+#: calendar/gui/print.c:300
+msgid "22nd"
+msgstr "22.nci"
+
+#: calendar/gui/print.c:300
+msgid "23rd"
+msgstr "23.ncü"
+
+#: calendar/gui/print.c:300
+msgid "24th"
+msgstr "24.ncü"
+
+#: calendar/gui/print.c:300
+msgid "25th"
+msgstr "25.nci"
+
+#: calendar/gui/print.c:301
+msgid "26th"
+msgstr "26.ncı"
+
+#: calendar/gui/print.c:301
+msgid "27th"
+msgstr "27.nci"
+
+#: calendar/gui/print.c:301
+msgid "28th"
+msgstr "28.nci"
+
+#: calendar/gui/print.c:301
+msgid "29th"
+msgstr "29.ncu"
+
+#: calendar/gui/print.c:301
+msgid "30th"
+msgstr "39.ncu"
+
+#: calendar/gui/print.c:302
+msgid "31st"
+msgstr "31.nci"
+
+#: calendar/gui/print.c:358
+msgid "Su"
+msgstr "Baz."
+
+#: calendar/gui/print.c:358
+msgid "Mo"
+msgstr "B.ei"
+
+#: calendar/gui/print.c:358
+msgid "Tu"
+msgstr "Ç.a"
+
+#: calendar/gui/print.c:358
+msgid "We"
+msgstr "Çə"
+
+#: calendar/gui/print.c:358
+msgid "Th"
+msgstr "C.a"
+
+#: calendar/gui/print.c:358
+msgid "Fr"
+msgstr "Cümə"
+
+#: calendar/gui/print.c:358
+msgid "Sa"
+msgstr "Şn"
+
+#: calendar/gui/print.c:944
+msgid "Tasks"
+msgstr "Vəzifə"
+
+#. Day
+#: calendar/gui/print.c:1074
+msgid "Current day (%a %b %d %Y)"
+msgstr "Hazırkı gün ( %a %b %d %Y )"
+
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+msgid "%a %b %d"
+msgstr "%a %b %d"
+
+#: calendar/gui/print.c:1089
+msgid "%a %d %Y"
+msgstr "%a %b %d"
+
+#: calendar/gui/print.c:1100
+#, c-format
+msgid "Current week (%s - %s)"
+msgstr "Hazırkı həftə ( %s - %s)"
+
+#. Month
+#: calendar/gui/print.c:1108
+msgid "Current month (%b %Y)"
+msgstr "Hazırkı ay ( %b %Y )"
+
+#. Year
+#: calendar/gui/print.c:1115
+msgid "Current year (%Y)"
+msgstr "Hazırkı il ( %Y )"
+
+#: calendar/gui/print.c:1152
+msgid "Print Calendar"
+msgstr "Təqvimi çap et"
+
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
+msgid "Print Preview"
+msgstr "Çap Etmə nümayişi"
+
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
+
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+msgid "SMTWTFS"
+msgstr "BBeÇaÇCaCŞ"
+
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"'%s' qaydalı ifadələrdə xəta oldu:\n"
+"%s"
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"'%s' qaydalı ifadələrdə xəta oldu:\n"
+"%s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s üçün qıfıl faylını yarada bilmədim: %s"
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Təzədən "
+"sına."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+"fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+"fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "%s məktub faylı yoxlana bilmir: %s"
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "%s məktub faylı açıla bilmir: %s"
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "Müvəqqəti məktub faylı %s açıla bilmir: %s"
+
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr "%s üçün qıfıl faylı sınana bilmədi: %s"
+
+#: camel/camel-movemail.c:243
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Məktub faylı oxunma xətası: %s"
+
+#: camel/camel-movemail.c:254
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
+
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "Boru yaradıla bilmədi: %s"
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr "Çəngəllənə bilmədi: %s"
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Məktub daşıma proqramı iflas etdi: %s"
+
+#: camel/camel-movemail.c:355
+msgid "(Unknown error)"
+msgstr "(Namə'lum xəta)"
+
+#: camel/camel-provider.c:137
+#, c-format
+msgid "Could not load %s: %s"
+msgstr "%s yüklənə bilmədi: %s"
+
+#: camel/camel-provider.c:145
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr "%s yüklənə bilmir: Modulda başlatma kodu yoxdur."
+
+#: camel/camel-remote-store.c:181
+#, c-format
+msgid "%s server %s"
+msgstr "%s verici %s"
+
+#: camel/camel-remote-store.c:185
+#, c-format
+msgid "%s service for %s on %s"
+msgstr "%s üstündə %s üçün %s xidmətləri"
+
+#: camel/camel-remote-store.c:232
+msgid "Connection cancelled"
+msgstr "Bağlantı Ləğv edildi"
+
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
+
+#: camel/camel-remote-store.c:236
+msgid "(unknown host)"
+msgstr "(namə'lum ev sahibi)"
+
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
+#: camel/providers/imap/camel-imap-command.c:289
+msgid "Operation cancelled"
+msgstr "Əməliyyat ləğv edildi"
+
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "Verici istifadəçi adını qəbul etmədi"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Tanıtma"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Süzgəc mə'lumatını yükləmə xətası:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Süzgəc mə'lumatını yükləmə xətası:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Bu seçənək SMTP vericisi ilə CRAM-MD5 təsdiqlənməsi ilə ünsiyyət "
+"quracaqdır."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "IMAP vericisi cavabı %s mə'lumatını daxil etmir"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Verci cavabı çox tez sonlandı."
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Bu seçənəklə siz IMAP vericisinə Kerberos 4 tanıdılması yolu ilə "
+"bağlana biləcəksiniz."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos bileti alına bilmir:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr "Vericidən xətalı tanıtma istəyi alındı."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
+
+#: camel/camel-search-private.c:105
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
+
+#: camel/camel-service.c:142
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
+
+#: camel/camel-service.c:151
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
+
+#: camel/camel-service.c:160
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr "'%s' URLsi yola ehtiyac hiss edir"
+
+#: camel/camel-service.c:512
+#, c-format
+msgid "No such host %s."
+msgstr "%s Ev sahibi mövcud deyildir."
+
+#: camel/camel-service.c:515
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr "%s ev sahibi müvəqqəti olaraq axtarıla bilmir."
+
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "_Virtual Qovluq Sehirbazı ..."
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+"Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
+
+#: camel/camel-session.c:322
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "`%s' protokolu üçün xidmətçi yoxdur"
+
+#: camel/camel-session.c:417
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"%s qovluğunu yarada bilmədim:\n"
+"%s"
+
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Vəzifə"
+
+#: camel/camel-url.c:77
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr "`%s' URL kəliməsi protokol haqqında mə'lumat daxil etmir"
+
+#: camel/camel-url.c:92
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr "`%s' URL kəliməsi hökmsüz protokol haqqında mə'lumat daxil edir"
+
+#: camel/camel-url.c:152
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
+"`%s' URLsindəki qapı nömrəßi rəqəm xaricində xarakter daxil edir"
+
+#: camel/camel-vee-folder.c:960
+#, c-format
+msgid "No such message: %s"
+msgstr "Bele bir ismarıc yoxdur: %s"
+
+#: camel/providers/imap/camel-imap-command.c:234
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "IMAP vericisindən gözlənilməz cavab alındı: %s"
+
+#: camel/providers/imap/camel-imap-command.c:242
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP əmri iflas etdi: %s"
+
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+msgid "Unknown error"
+msgstr "Namə'lum xəta"
+
+#: camel/providers/imap/camel-imap-command.c:297
+msgid "Server response ended too soon."
+msgstr "Verci cavabı çox tez sonlandı."
+
+#: camel/providers/imap/camel-imap-command.c:433
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP vericisi cavabı %s mə'lumatını daxil etmir"
+
+#: camel/providers/imap/camel-imap-command.c:469
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "IMAP vericisindən gözlənilməz qəbul cavabı alındı: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:199
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s üçün mündəricat yüklənə bilmədi"
+
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "\"%s\" dakı qovluqlar daranır"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
+msgid "Could not find message body in FETCH response."
+msgstr "FETCH cavabında ismarıc gövdəsi tapıla bilmədi"
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+"IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+"IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
+
+#: camel/providers/imap/camel-imap-store.c:263
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana "
+"biləcəksiniz."
+
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"İstənən tanıtma protokoluna dəstək verilmir."
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Tanıtma lazım deyildir."
+
+#: camel/providers/imap/camel-imap-store.c:454
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%sLütfən %s@%s üçün IMAP parolunu girin"
+
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"IMAP vericisinə tanıdılma xətası.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:772
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "%s qovluğunu yarada bilmədim: %s"
+
+#: camel/providers/local/camel-local-provider.c:36
+msgid "MH-format mail directories"
+msgstr "MH-şəklində məktub qovluqları"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+"Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "Standard Unix mailbox file"
+msgstr "Standart UNIX məktub qutusu faylı"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Standart mbox şəklindəki məktubların saxlanması üçün"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "Qmail maildir-format mail files"
+msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+"Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
+
+#: camel/providers/local/camel-local-store.c:128
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr "%s kök saxlama dəqiq bir yol deyildir"
+
+#: camel/providers/local/camel-local-store.c:135
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "%s kök saxlama düzgün bir qovluq deyildir."
+
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Qovluq alına bilmədi: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:174
+#, fuzzy
+msgid "Local stores do not have an inbox"
+msgstr "Yerli saxlamaların kök qovluğu yoxdur"
+
+#: camel/providers/local/camel-local-store.c:184
+#, c-format
+msgid "Local mail file %s"
+msgstr "%s Yeli məktub faylı"
+
+#: camel/providers/local/camel-local-store.c:240
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "%s faylı %s adi ilə təzədən adlandırıla bilmir: %s"
+
+#: camel/providers/local/camel-local-store.c:282
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
+
+#: camel/providers/local/camel-local-store.c:292
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "İsmarıc məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:317
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Belə bir ismarıc yoxdur"
+
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
+msgid "Invalid message contents"
+msgstr "Hökmsüz ismarıc mövtəviyyatı"
+
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' qovluğu açıla bilmir: \n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "`%s' faylı yoxdur ."
+
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' qovluğu yaradıla bilmədi:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:120
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' məktub qovluğu faylı deyildir."
+
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "`%s' qovluğu silinə bilmir: %s"
+
+#: camel/providers/local/camel-maildir-store.c:150
+msgid "not a maildir directory"
+msgstr "məktub qovluğu faylı deyildir"
+
+#: camel/providers/local/camel-mbox-folder.c:201
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:257
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "İsmarıc mbox fayllına əlava edilə bimir: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"İsmarıc alına bilmir: %s qovluğundan %s\n"
+"   %s"
+
+#: camel/providers/local/camel-mbox-folder.c:366
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
+
+#: camel/providers/local/camel-mbox-folder.c:379
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
+
+#: camel/providers/local/camel-mbox-store.c:92
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"`%s' Faylı açıla bilmir:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:108
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+"`%s' faylı yaradıla bilmədi: \n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr "`%s' normal bir fayl deyildir ."
+
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' qovluğu silinə bilmir:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:151
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr "`%s' qovluğu boş deyildir. Silinmədi."
+
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Qovluq sinxronlaşdırılır"
+
+#: camel/providers/local/camel-mbox-summary.c:245
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Qovluq açıla bilmir: %s:%ld yerindən toplanır: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:287
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "%ld yeri yaxınlığında %s qovluğunda ciddi məktub darama xətası"
+
+#: camel/providers/local/camel-mbox-summary.c:362
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Qovluq toplana bilmir: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+msgid "Synchronising folder"
+msgstr "Qovluq sinxronlaşdırılır"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Qovluq toplanmaq üçün açıla bilmir: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:515
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+"Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da "
+"əlbətdə"
+
+#: camel/providers/local/camel-mbox-summary.c:591
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Müvəqqəti məktub qutusuna yazıla bilmir: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:608
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:635
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:646
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "Qovluq təzədən adlandırıla bilmir: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:870
+#, c-format
+msgid "Unknown error: %s"
+msgstr "Namə'lum xəta: %s"
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "mh qovluğuna ismarıc əlavə edilə bilmir: %s: %s"
+
+#: camel/providers/local/camel-mh-store.c:108
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "`%s' qovluq deyildir."
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%s@%s üçün parolu lütfən girin"
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr "Verici istifadəçi adını qəbul etmədi"
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
+
+#: camel/providers/nntp/camel-nntp-folder.c:115
+#, c-format
+msgid "Message %s not found."
+msgstr "%s ismarıcı tapıla bilmədi"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "Vericidən qrup adı öyrənilə bilmədi."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr "USENET xəbərləri"
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+"USENET xəbər qruplarına göndərilmiş hər hansı bir xəbəri oxumaq "
+"üçün bir vasitədir."
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr "Xəbər vericisi üçün qovluq açıla bilmir: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr "%s dan(dən) USENET Xəbərləri"
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Bu seçənək NNTP verisici ilə düz mətn şəklindəki parol ilə "
+"ünsiyyət quracaqdır."
+
+#: 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 "%s üçün .newsrc faylı açıla bilmir ya da yaradıla bilmir: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "İsmarıclar alınır"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
+msgid "Could not open folder: message listing was incomplete."
+msgstr "Qovluq açıla bilmir: ismarıc siyahısı bütün deyil."
+
+#: camel/providers/pop3/camel-pop3-folder.c:282
+#, c-format
+msgid "No message with uid %s"
+msgstr "%s uid'li ismarıc yoxdur"
+
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "%s ismarıcı alınır"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "%s POP vericisindən ismarıclar alına bilmədi: %s"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr "POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+"POP vericilərinə bağlanmaq üçündür. POP protokolu eyni zamanda bə'zi "
+"web məktubsistemlərindən məktub almaq üçün də işlədilə bilir."
+
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"POP vericilərinə bağlanmaq üçündür. POP protokolu eyni zamanda bə'zi "
+"web məktubsistemlərindən məktub almaq üçün də işlədilə bilir."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Bu seçənək POP verisici ilə düz mətn şəklindəki parol ilə "
+"ünsiyyət quracaqdır.Bu bir çox məktub vericisi tərəfindən "
+"dəstəklənən yeganə seçənakdir."
+
+#: camel/providers/pop3/camel-pop3-store.c:157
+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 ""
+"Bu seçənək POP verisici ilə APOP protokolu ilə kodlanmış parol ilə "
+"ünsiyyət quracaqdır. Bu seçənək bütün vericilər tərəfindən "
+"bütün istifadəçilər üçün dəstəklənməz."
+
+#: camel/providers/pop3/camel-pop3-store.c:169
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+"Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət "
+"quracaqdır."
+
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:331
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
+
+#: camel/providers/pop3/camel-pop3-store.c:378
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
+
+#: camel/providers/pop3/camel-pop3-store.c:397
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"İstifadəçi adı göndərilmə xətası oldu: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
+msgid "(Unknown)"
+msgstr "(Namə'lum)"
+
+#: camel/providers/pop3/camel-pop3-store.c:427
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"İstənən tanıtma protokoluna dəstək verilmir."
+
+#: camel/providers/pop3/camel-pop3-store.c:435
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"Parol göndərmə xətası oldu: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:543
+#, c-format
+msgid "No such folder `%s'."
+msgstr "`%s' deyə bir qovluq yoxdur."
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Yerli sistemdəki \"sendmail\" proqramı istifadə edilərək məktub "
+"göndərmək üçün."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+"Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub "
+"göndərilmədi"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr "İsmarıc göndərilə bilmədi: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+"sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr "%s işə salına bilmir: məktub göndərilə bilmədi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "sendmail %d halı ilə bağlandı: məktub göndərilə bilmədi."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "FETCH cavabında ismarıc gövdəsi tapıla bilmədi"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
+msgid "sendmail"
+msgstr "sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
+msgid "Mail delivery via the sendmail program"
+msgstr "Sendmail proqramı ilə məktub göndərilməsi"
+
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+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"
+msgstr ""
+"SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub "
+"göndərmək üçün."
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub "
+"göndərmək üçün."
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "İsmarıcları Gizlət"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Oxunmuşları gizlət"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Parol istənmir"
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"İstənən tanıtma protokoluna dəstək verilmir."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Tanıtma lazım deyildir."
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Tanıtma lazım deyildir."
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr "Xoş gəldin ismarıcı cavab xətası: %s: ağır deyil dəyəsən"
+
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sLütfən %s@%s üçün IMAP parolunu girin"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
+msgid "No authentication required"
+msgstr "Tanıtma lazım deyildir."
+
+#: camel/providers/smtp/camel-smtp-transport.c:468
+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 ""
+"Bu seçənək SMTP vericisi ilə təßdiqlənməyə ehtiyac hiss etmədən "
+"ünsiyyət qurar. Bu da bir çox vericiyə bağlanmaq üçün yaxşı "
+"fikirdir."
+
+#: camel/providers/smtp/camel-smtp-transport.c:511
+#, c-format
+msgid "SMTP server %s"
+msgstr "%s SMTP vericisi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:513
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s dan(dən) SMTP məktub göndərilməsi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:538
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+"İsmarıc göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+"İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
+
+#: camel/providers/smtp/camel-smtp-transport.c:559
+msgid "Cannot send message: no recipients defined."
+msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
+
+#: camel/providers/smtp/camel-smtp-transport.c:653
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr "HELO istək vaxtı doldu: %s: ağır deyil"
+
+#: camel/providers/smtp/camel-smtp-transport.c:672
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr "HELO cavablama xətası: %s. ağır deyil"
+
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "RSET istək vaxt dolması. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Vericidən xətalı tanıtma istəyi alındı."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:821
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:846
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "RCTP TO cavablama xətası: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:896
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:915
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "DATA cavablama xətası: %s: məktub göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+"DATA göndərmə vaxt dolması: ismarıc qurtarılır: %s: məktub "
+"göndərilə bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:967
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+"DATA cavablama xətası: ismarıc qurtarılması: %s: məktub göndərilə "
+"bilmədi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:991
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr "RSET istək vaxt dolması. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1010
+#, c-format
+msgid "RSET response error: %s"
+msgstr "RSET cavablama xətası: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1033
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr "QUİT istək vaxt dolması: %s: ağır xəta"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1052
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr "QUİT cavablama xətası: %s: ağır deyil"
+
+#: composer/e-msg-composer-attachment-bar.c:87
+msgid "1 byte"
+msgstr "1 bayt"
+
+#: composer/e-msg-composer-attachment-bar.c:89
+#, c-format
+msgid "%u bytes"
+msgstr "%u bayt"
+
+#: composer/e-msg-composer-attachment-bar.c:96
+#, c-format
+msgid "%.1fK"
+msgstr "%.1fK"
+
+#: composer/e-msg-composer-attachment-bar.c:100
+#, c-format
+msgid "%.1fM"
+msgstr "%.1fM"
+
+#: composer/e-msg-composer-attachment-bar.c:104
+#, c-format
+msgid "%.1fG"
+msgstr "%.1fG"
+
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+msgid "attachment"
+msgstr "yapışdırılmış fayl"
+
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir fayl yapışdır"
+
+#: composer/e-msg-composer-attachment-bar.c:461
+msgid "Remove selected items from the attachment list"
+msgstr "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
+
+#: composer/e-msg-composer-attachment-bar.c:492
+msgid "Add attachment..."
+msgstr "Yapışdırılmış fayl əlavə et ..."
+
+#: composer/e-msg-composer-attachment-bar.c:493
+msgid "Attach a file to the message"
+msgstr "İsmarıca bir fayl əlavə et"
+
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+msgid "Attachment"
+msgstr "Yapışdırılmış fayl"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Yapışdırılmış fayl xüsusiyyətləri"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Fayl adı :"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "yapışdırılmış fayl"
+
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "MIME növü:"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "\"%s\"i(ı) GÖndər"
+
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Ünvan dəftəri üçün buraya tıqla"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "Göndərən:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Cavab ver"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Mövzu :"
+
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+msgid "To:"
+msgstr "Gn:"
+
+#: composer/e-msg-composer-hdrs.c:377
+msgid "Enter the recipients of the message"
+msgstr "İsmarıcın göndərildiği adamlar"
+
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:381
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "İsmarıcın nüsxəsinin göndəriləcəyi ünvanlar"
+
+#: composer/e-msg-composer-hdrs.c:384
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:385
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"İsmarıcın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar "
+"özlərini ismarıcın göndərildiği adamlar arasında görməyəcəkdir ."
+
+#: composer/e-msg-composer.c:518
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+"%s imza faylı açıla bilmədi:\n"
+"%s"
+
+#: composer/e-msg-composer.c:706
+msgid "Save as..."
+msgstr "Fərqli qeyd et ..."
+
+#: composer/e-msg-composer.c:717
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: composer/e-msg-composer.c:737
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Fayl yüklərkən xəta oldu: %s"
+
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:824
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarıc göndərilə bilmədi.\n"
+"\n"
+"Dəyişiklikləri qeyd etmak istəyirsiniz mi?"
+
+#: composer/e-msg-composer.c:849
+msgid "Open file"
+msgstr "Faylı aç"
+
+#: composer/e-msg-composer.c:975
+msgid "That file does not exist."
+msgstr "Belə bir fayl yoxdur ."
+
+#: composer/e-msg-composer.c:985
+msgid "That is not a regular file."
+msgstr "Bu normal bir fayl deyildir ."
+
+#: composer/e-msg-composer.c:995
+msgid "That file exists but is not readable."
+msgstr "Bu fayl vardır amma oxuna bilən deyildir ."
+
+#: composer/e-msg-composer.c:1005
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+"Bu fayl əl çatıla biləndi dəyəsən amma open(2)-çağırışı iflas "
+"etdi ."
+
+#: composer/e-msg-composer.c:1027
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
+"Bu fayl çox böyükdür ( 100 KB'dən böyük ! ) .\n"
+"Bu faylı daxil etmək istəyirsan mi?"
+
+#: composer/e-msg-composer.c:1048
+msgid "An error occurred while reading the file."
+msgstr "Faylı oxurkən bir xəta oldu ."
+
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+msgid "Compose a message"
+msgstr "Bir ismarıc yaz"
+
+#: composer/e-msg-composer.c:1765
+msgid "Could not create composer window."
+msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
+msgid "Cannot initialize Evolution's composer."
+msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
+
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evolution çubuğu _qısa yolu"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Ünvan"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "İstifadəçi Haqqında"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%m/%d/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %m/%d/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: executive-summary/component/component-factory.c:152
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolutionun Executive Summary parçasını başlada bilmədim ."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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 ""
+"İcracı Mündəricatının arxaplanı üçün başqa HTML səhifəsi seçə "
+"bilərsiniz\n"
+"\n"
+"Ana seçənək üçün boş buraxın"
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr "%s i əsas GNOME proqramı ilə aç"
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr "%s i əsas GNOME səyyahı ilə aç"
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr "%s a(ə) məktub göndər"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr "Görünüşü %s a(ə)dəyişdir"
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr "%s i(ı) İşə sal"
+
+#: executive-summary/component/e-summary-url.c:75
+#, c-format
+msgid "Close %s"
+msgstr "%s i(ı) Qapat"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr "%s i(ı) sola köçür"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr "%s i(ı) sağa köçür"
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr "%s i(ı) əvvəlki sətirə köçür"
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr "%s i(ı) sonrakı sətirə köçür"
+
+#: executive-summary/component/e-summary-url.c:80
+#, c-format
+msgid "Configure %s"
+msgstr "%s i(ı) Quraşdır"
+
+#: executive-summary/component/e-summary.c:918
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Html Faylını aça bilmədim:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:932
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+" Data oxunarkən xəta oldu:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr "Faylının xidmətlər üçün ayrılmış sahəsi yoxdur.\n"
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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 ""
+"İcracı mündəricatı üzvü Bonoboyu başlada bilmədi.\n"
+"Əgər RootPOA haqqında xəbərdarlıq aldınız isə, deməli Bonoboyu OAG "
+"yerinə\n"
+"GOAD ila dayıqladınız."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "Mündəricat"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+msgid "Error"
+msgstr "Xəta"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update every "
+msgstr "Boş/Məşğulları _Təzələ"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "dəqiqələr"
+
+#: filter/filter-datespec.c:62
+msgid "year"
+msgstr "il"
+
+#: filter/filter-datespec.c:62
+msgid "years"
+msgstr "illər"
+
+#: filter/filter-datespec.c:63
+msgid "month"
+msgstr "ay"
+
+#: filter/filter-datespec.c:63
+msgid "months"
+msgstr "aylar"
+
+#: filter/filter-datespec.c:64
+msgid "week"
+msgstr "həftə"
+
+#: filter/filter-datespec.c:64
+msgid "weeks"
+msgstr "həftələr"
+
+#: filter/filter-datespec.c:65
+msgid "days"
+msgstr "günlər"
+
+#: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "saat"
+
+#: filter/filter-datespec.c:66
+msgid "hours"
+msgstr "saatlar"
+
+#: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "dəqiqə"
+
+#: filter/filter-datespec.c:68
+msgid "second"
+msgstr "saniyə"
+
+#: filter/filter-datespec.c:68
+msgid "seconds"
+msgstr " saniyələr"
+
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr "Vaxsey. Tarix atmağı unutmusan."
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr "Vaxsey. Hökmsüz tarixi seçmisən."
+
+#: filter/filter-datespec.c:259
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
+"Bu ismarıc tarixi süzgəcin işlədiyi və ya\n"
+"vfolderin açıq qaldığı müddət ilə müqayisə\n"
+"ediləcəkdir."
+
+#: filter/filter-datespec.c:282
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
+"Bu ismarıc tarixi burada göstərdiyiniz ilə\n"
+"müqayisə ediləcəkdir."
+
+#: filter/filter-datespec.c:322
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+"Bu ismarıc tarixi süzgəcin işlədiyi müddət\n"
+"ilə müqayisə edilaəkdir;\n"
+"\"bir haftə əvval\" məsələn."
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:357
+msgid "the current time"
+msgstr "indiki vaxt"
+
+#: filter/filter-datespec.c:357
+msgid "a time you specify"
+msgstr "bildirdiyin vaxt"
+
+#: filter/filter-datespec.c:358
+msgid "a time relative to the current time"
+msgstr "indiki vaxta görə müddət"
+
+#. The label
+#: filter/filter-datespec.c:416
+msgid "Compare against"
+msgstr "Müqayisə et"
+
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "indi"
+
+#: filter/filter-datespec.c:690
+msgid "<click here to select a date>"
+msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
+
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Süzgəc Qaydaları"
+
+#. and now for the action area
+#: filter/filter-filter.c:424
+msgid "Then"
+msgstr "Onda"
+
+#: filter/filter-filter.c:437
+msgid "Add action"
+msgstr "Gediş əavə et"
+
+#: filter/filter-filter.c:443
+msgid "Remove action"
+msgstr "Gedişi sil"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+"VAxsey, qovluq seçməyi unutdunuz.\n"
+"Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq "
+"seçin."
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+msgid "Select Folder"
+msgstr "Qovluq Seçin"
+
+#: filter/filter-folder.c:243
+msgid "Enter folder URI"
+msgstr "Qovluq URIsini Bildirin"
+
+#: filter/filter-folder.c:289
+msgid "<click here to select a folder>"
+msgstr "<qovluq seçmək üçün buraya tıqlayın>"
+
+#: filter/filter-input.c:189
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"'%s' qaydalı ifadələrdə xəta oldu:\n"
+"%s"
+
+#: filter/filter-part.c:467
+msgid "Test"
+msgstr "Sınaq"
+
+#: filter/filter-rule.c:597
+msgid "Rule name: "
+msgstr "Qayda adı :"
+
+#: filter/filter-rule.c:601
+msgid "Untitled"
+msgstr "Adsız"
+
+#: filter/filter-rule.c:617
+msgid "If"
+msgstr "Əgər"
+
+#: filter/filter-rule.c:634
+msgid "Execute actions"
+msgstr "Gedişi işə sal"
+
+#: filter/filter-rule.c:638
+msgid "if all criteria are met"
+msgstr "bütün kriteriyalar uyğun gəlirsə"
+
+#: filter/filter-rule.c:643
+msgid "if any criteria are met"
+msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
+
+#: filter/filter-rule.c:654
+msgid "Add criterion"
+msgstr "Kriteriya əlavə et"
+
+#: filter/filter-rule.c:660
+msgid "Remove criterion"
+msgstr "Kriteriyanı sil"
+
+#: filter/filter-system-flag.c:67
+msgid "Replied to"
+msgstr "Cavab verilən"
+
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
+msgid "Important"
+msgstr "Vacib"
+
+#: filter/filter-system-flag.c:71
+msgid "Read"
+msgstr "Oxu"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Süzgəcləri Düzəlt"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VFolderləri Düzəlt"
+
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid "Incoming"
+msgstr "gələn"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Gedən"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+msgid "Virtual Folders"
+msgstr "Virtual Qovluqlar"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Bildirilən qovluq tapıla bilmədi"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder Qaynaqları"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Yerli qovluğu qeydiyyatdan keçir"
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Colour"
+msgstr "Rəngi Seç"
+
+#: filter/libfilter-i18n.h:4
+msgid "Assign Score"
+msgstr "Qaynağı Seç"
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Yapışdırılmış fayl"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "daxil edir"
+
+#: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Qovluğa Köçürt"
+
+#: filter/libfilter-i18n.h:9
+msgid "Date received"
+msgstr "Alınma tarixi"
+
+#: filter/libfilter-i18n.h:10
+msgid "Date sent"
+msgstr "Göndərilmə tarixi"
+
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "daxil etmir"
+
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "ilə sonlanmır"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "oxçamır"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "başlamır"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "sonlanır"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Çı_x"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "mövcuddur"
+
+#: filter/libfilter-i18n.h:21
+msgid "Expression"
+msgstr "İfadə"
+
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "İsmarıcı ünvana irəlilət"
+
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "dir(dır)"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "deyil"
+
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s məktublaşma qrupu"
+
+#: filter/libfilter-i18n.h:28
+msgid "Message Body"
+msgstr "İsmarıc Gövdəsi"
+
+#: filter/libfilter-i18n.h:29
+msgid "Message Header"
+msgstr "İsmarıc Başlığı"
+
+#: filter/libfilter-i18n.h:30
+msgid "Message was received"
+msgstr "İsmarıc alındı"
+
+#: filter/libfilter-i18n.h:31
+msgid "Message was sent"
+msgstr "İsmarıc göndərildi"
+
+#: filter/libfilter-i18n.h:32
+msgid "Move to Folder"
+msgstr "Qovluğa Köçür"
+
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "da(də) ya da sonra"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "da(də) ya da əvvəl"
+
+#: filter/libfilter-i18n.h:35
+msgid "Recipients"
+msgstr "Alıcılar"
+
+#: filter/libfilter-i18n.h:36
+msgid "Regex Match"
+msgstr "Regex Uyğunluqları"
+
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Xal"
+
+#: filter/libfilter-i18n.h:39
+msgid "Set Status"
+msgstr "Hal Seç"
+
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "oxşayır"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
+msgstr "Qaynaq"
+
+#: filter/libfilter-i18n.h:42
+msgid "Specific header"
+msgstr "Xas başlıq"
+
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "başlayır"
+
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr "İşi Dayandır"
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Mövzu"
+
+#: filter/libfilter-i18n.h:47
+msgid "was after"
+msgstr "sonra idi"
+
+#: filter/libfilter-i18n.h:48
+msgid "was before"
+msgstr "əvvəl idi"
+
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
+msgstr "Qiymətləndirmə Qaydasını Düzəlt"
+
+#: mail/component-factory.c:306
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
+
+#: mail/component-factory.c:379
+msgid "Cannot register storage with shell"
+msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
+
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Seçənəklər"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Seçənəklər"
+
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr "Axtarışı vFolder olaraq saxla"
+
+#: mail/folder-browser.c:509
+msgid "VFolder on Subject"
+msgstr "Mövzudakı vFolder"
+
+#: mail/folder-browser.c:512
+msgid "VFolder on Sender"
+msgstr "Göndərəndəki vFolder"
+
+#: mail/folder-browser.c:515
+msgid "VFolder on Recipients"
+msgstr "Alıcıdakı vFolder"
+
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Məktublaşma Qrupundakı Süzgəc"
+
+#: mail/folder-browser.c:524
+msgid "Filter on Subject"
+msgstr "Mövzudakı Süzgəc"
+
+#: mail/folder-browser.c:527
+msgid "Filter on Sender"
+msgstr "Göndərəndəki  Süzgəc"
+
+#: mail/folder-browser.c:530
+msgid "Filter on Recipients"
+msgstr "Alıcıdakı Süzgəc"
+
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
+msgid "Filter on Mailing List"
+msgstr "Məktublaşma Qrupundakı Süzgəc"
+
+#: mail/folder-browser.c:544
+msgid "Save As..."
+msgstr "Fərqli qeyd et ..."
+
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Çap Et"
+
+#: mail/folder-browser.c:551
+msgid "Reply to Sender"
+msgstr "Göndərənə cavab ver"
+
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+msgid "Reply to All"
+msgstr "Hamısına cavab ver"
+
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+msgid "Forward"
+msgstr "Davam etdir"
+
+#: mail/folder-browser.c:557
+msgid "Forward inline"
+msgstr "Həmən çatdır"
+
+#: mail/folder-browser.c:560
+msgid "Mark as Read"
+msgstr "Oxunmış olaraq işarətlə"
+
+#: mail/folder-browser.c:562
+msgid "Mark as Unread"
+msgstr "Oxunmamış olaraq işarətlə"
+
+#: mail/folder-browser.c:567
+msgid "Move to Folder..."
+msgstr "Qovluğa Daşı..."
+
+#: mail/folder-browser.c:569
+msgid "Copy to Folder..."
+msgstr "Qovluğa Köçür..."
+
+#: mail/folder-browser.c:573
+msgid "Undelete"
+msgstr "Geri Qaytar"
+
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
+msgid "Apply Filters"
+msgstr "Süzgəclər Əlavə Et"
+
+#: mail/folder-browser.c:587
+msgid "Create Rule From Message"
+msgstr "İsmarıcdan Qayda Yarat"
+
+#: mail/folder-browser.c:704
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Məktublaşma Qrupunda Süz (%s)"
+
+#: mail/folder-browser.c:705
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Məktublaşma Qrupunda Süz (%s)"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Evolutionun Executive Summary parçasını başlada bilmədim ."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr "Hazırkı Saxlama Şəkli:"
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr "Maktub Qutusu Şəkli"
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr "Yeni saxlama şəkli"
+
+#: 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
+#, fuzzy
+msgid "maildir"
+msgstr "ePoçt"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr "mh"
+
+#: mail/mail-accounts.c:116
+msgid " (default)"
+msgstr " (varsayılan) "
+
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz mi?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz mi?"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:423
+msgid "Evolution Account Manager"
+msgstr "Evolution Hesab İdarəcisi"
+
+#: mail/mail-account-editor.c:307
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+"Bir və ya daha çox xidmət düzgün quraşdırılmayıb.\n"
+"Yenə də qeyd etmək istəyisiniz mi?"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:706
+msgid "Evolution Account Editor"
+msgstr "Evolution Hesab Düzəldicisi"
+
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Xas başlıq"
+
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr "%s a(ə) məktub göndər"
+
+#: mail/mail-autofilter.c:214
+#, c-format
+msgid "Subject is %s"
+msgstr "Mövzu %s dir(dır)"
+
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr "Məktub %s dandır(dəndir)"
+
+#: mail/mail-autofilter.c:286
+#, c-format
+msgid "%s mailing list"
+msgstr "%s məktublaşma qrupu"
+
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Süzgəc Qaydası Əlavə Et"
+
+#: mail/mail-callbacks.c:85
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Məktub alıcısını hələ quraşdırmamısınız.\n"
+"Məktub yazmaq, almaq, göndərmədən əvvəl \n"
+"bunu quraşdırmalısınız.\n"
+"Bunu indi quraşdırmaq istəyirsiniz mi?"
+
+#: mail/mail-callbacks.c:138
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir \n"
+"şəxs tanıtmalısan."
+
+#: mail/mail-callbacks.c:150
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir ePoçt\n"
+"nəqliyyatını qurmalısan."
+
+#: mail/mail-callbacks.c:194
+msgid "You have not set a mail transport method"
+msgstr "Maktub nəql yolunu bildirməmisən"
+
+#: mail/mail-callbacks.c:227
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Bu ismarıcın mövzusu yoxdur .\n"
+"Həqiqətan də göndərim mi?"
+
+#: mail/mail-callbacks.c:294
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"Bu ePoçtu göndərməkdən əvvəl bir ePoçt\n"
+"hesabını quraşdırmalısan."
+
+#: mail/mail-callbacks.c:316
+msgid "You must specify recipients in order to send this message."
+msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
+
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "%s da(də) %s yazmışdır:\n"
+
+#: mail/mail-callbacks.c:761
+msgid "Forwarded message:\n"
+msgstr "Bu ismarıcı çatdır:\n"
+
+#: mail/mail-callbacks.c:864
+msgid "Move message(s) to"
+msgstr "İsmarıc(ları) buraya daşı "
+
+#: mail/mail-callbacks.c:866
+msgid "Copy message(s) to"
+msgstr "İsmarıc(ları) buraya köçürt"
+
+#: mail/mail-callbacks.c:1007
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
+"ismarıcları düzəldə bilərsiniz."
+
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+msgid "Overwrite file?"
+msgstr "Faylının üsütünə yazım mı?"
+
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlı bir fayl onsuz da vardır.\n"
+"Üstünə yazım mı?"
+
+#: mail/mail-callbacks.c:1088
+msgid "Save Message As..."
+msgstr "İsmarıcı Fərqli Qeyd Et..."
+
+#: mail/mail-callbacks.c:1090
+msgid "Save Messages As..."
+msgstr "İsmarıcları Fərqli Qeyd Et..."
+
+#: mail/mail-callbacks.c:1204
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Süzgəc mə'lumatını yükləmə xətası:\n"
+"%s"
+
+#: mail/mail-callbacks.c:1253
+msgid "Print Message"
+msgstr "İsmarıcı Çap Et"
+
+#: mail/mail-callbacks.c:1300
+msgid "Printing of message failed"
+msgstr "İsmarıların çap edilməsi bacarılmadı"
+
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "ePoçt Hesabı"
+
+#: mail/mail-config.glade.h:2
+msgid "Account Information"
+msgstr "Hesab Haqqında"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "Account Management"
+msgstr "Evolution Hesab İdarəcisi"
+
+#: mail/mail-config.glade.h:5
+msgid "Advanced"
+msgstr "Ətraflı"
+
+#: mail/mail-config.glade.h:6
+msgid "Authentication"
+msgstr "Tanıtma"
+
+#: mail/mail-config.glade.h:7
+msgid "Authentication Type:"
+msgstr "Tanıtma Növü:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Qurğuları Sına"
+
+#: mail/mail-config.glade.h:12
+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 ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Ətraflı"
+
+#: mail/mail-config.glade.h:21
+msgid "Done"
+msgstr "Qurtardı"
+
+#: mail/mail-config.glade.h:23
+msgid "Email Address:"
+msgstr "ePoçt Ünvanı: "
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "ePoçt ünvanı : "
+
+#: mail/mail-config.glade.h:25
+msgid "Evolution Mail Configuration"
+msgstr "Evolution ePoçt Quraşdırılması"
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr "Tam Ad:"
+
+#: mail/mail-config.glade.h:29
+msgid "Hostname:"
+msgstr "Verici Adı:"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Kimlik"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "Vericidən ismarıcı sil"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config.glade.h:35
+msgid "Mail"
+msgstr "Məktub"
+
+#: mail/mail-config.glade.h:36
+msgid "Mail Account"
+msgstr "ePoçt Hesabı"
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr "ePoçt Quraşdırılması"
+
+#: mail/mail-config.glade.h:38
+msgid "Mail Configuration Druid"
+msgstr "ePoçt Quraşdırılması Vasitəsi"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "İsmarıcları görünmüş olaraq işarətlə: "
+
+#: mail/mail-config.glade.h:42
+msgid "News"
+msgstr "Xəbərlər"
+
+#: mail/mail-config.glade.h:44
+msgid "Optional"
+msgstr "Arzuya Görə"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Orqanizasiya"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Password:"
+msgstr "Parol"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "ePoçt Göndərilir"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "Bu parlu yadda saxla"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "ePoçt ünvanı : "
+
+#: mail/mail-config.glade.h:54
+msgid "Required"
+msgstr "Lazımi"
+
+#: mail/mail-config.glade.h:56
+msgid "Save password"
+msgstr "PArolu Qeyd Et"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+msgid "Select signature file"
+msgstr "Imza faylını seç"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "ePoçtyı HTML Şəklində göndər"
+
+#: mail/mail-config.glade.h:60
+msgid "Sending Email"
+msgstr "ePoçt Göndərilir"
+
+#: mail/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr "Verici Quraşdırılması"
+
+#: mail/mail-config.glade.h:63
+msgid "Server Type: "
+msgstr "Verici Növü: "
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Verici Növü: "
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Imza faylı : "
+
+#: mail/mail-config.glade.h:67
+msgid "Signature:"
+msgstr "Imza:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Qaynaqlar"
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Şəffaf"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Tanıtma"
+
+#: mail/mail-config.glade.h:73
+msgid "Type"
+msgstr "Növ"
+
+#: mail/mail-config.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.glade.h:75
+msgid "User Information"
+msgstr "İstifadəçi Haqqında"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "İstifadəçi adı :"
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Düzəlt"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "dəqiqələr"
+
+#: mail/mail-config-druid.c:421
+#, c-format
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
+msgstr ""
+"Gələn məktubun quruluşu başa düşülmədi.\n"
+"%s dan(dən) məktub alınmasında problem yaşaya biləsiniz"
+
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "Ad :"
+
+#: mail/mail-config-druid.c:708
+#, c-format
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
+msgstr ""
+"Gedən məktub qurğuları başa düşülmədi.\n"
+"%s a(ə) məktub göndərilməsində problem yaşaya biləsiniz"
+
+#. set window title
+#: mail/mail-config-druid.c:1215
+msgid "Evolution Account Wizard"
+msgstr "Evolution Hesab Sehirbazı"
+
+#: mail/mail-display.c:189
+msgid "Save Attachment"
+msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#: mail/mail-display.c:229
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#: mail/mail-display.c:290
+msgid "Save to Disk..."
+msgstr "Diskə Qeyd Et ..."
+
+#: mail/mail-display.c:292
+#, c-format
+msgid "Open in %s..."
+msgstr "%s da(də) Aç ..."
+
+#: mail/mail-display.c:294
+msgid "View Inline"
+msgstr "İçərisini Göstər"
+
+#: mail/mail-display.c:323
+msgid "External Viewer"
+msgstr "Xarici Göstərici"
+
+#: mail/mail-display.c:346
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "İçərisini Göstər (%s ilə)"
+
+#: mail/mail-display.c:350
+msgid "Hide"
+msgstr "Gizlət"
+
+#: mail/mail-format.c:506
+#, c-format
+msgid "%s attachment"
+msgstr "%s yapışdırılmış fayl"
+
+#: mail/mail-format.c:704
+#, fuzzy
+msgid "Loading message content"
+msgstr "Hökmsüz ismarıc mövtəviyyatı"
+
+#: mail/mail-format.c:993
+msgid "Encrypted message not displayed"
+msgstr "Kodlanmış ismarıc göstərilmədi"
+
+#: mail/mail-format.c:999
+msgid "Encrypted message"
+msgstr "Kodlanmış İsmarıc"
+
+#: mail/mail-format.c:1000
+msgid "Click icon to decrypt."
+msgstr "Kodu açmaq üçün timsala basın."
+
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP saytını göstərən ox (%s)"
+
+#: mail/mail-format.c:1689
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
+
+#: mail/mail-format.c:1693
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerli faylyi göstərən ox (%s)"
+
+#: mail/mail-format.c:1727
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə "
+
+#: mail/mail-format.c:1732
+msgid "Malformed external-body part."
+msgstr "Xəsərli xarici proqram parçası."
+
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "`%s' deyə bir qovluq yoxdur."
+
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "%s da(də) Aç ..."
+
+#: mail/mail-local.c:786
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
+
+#: mail/mail-local.c:790
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr "\"%s\" qovluğunu \"%s\" şəklinə çevir"
+
+#: mail/mail-local.c:814
+msgid "Reconfiguring folder"
+msgstr "Qovluq təzədən qurulur"
+
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
+msgid "Closing current folder"
+msgstr "Hazırkı qovluq qapadılır"
+
+#: mail/mail-local.c:875
+msgid "Renaming old folder and opening"
+msgstr "Köhnə qovluğun adı dəyişdirilir və açılır"
+
+#: mail/mail-local.c:893
+msgid "Creating new folder"
+msgstr "Yeni bir qovluq yarat"
+
+#: mail/mail-local.c:907
+msgid "Copying messages"
+msgstr "İsmarıclar köçürülür"
+
+#: mail/mail-local.c:928
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+"Qovluğun meta mə'lumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
+"bilməyə biləsən: %s"
+
+#: mail/mail-local.c:967
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+"Bu qovluğu bir də aça bilməsən, onu əllə\n"
+"bərpa etməlisən."
+
+#: mail/mail-mt.c:177
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"'%s' sırasında xəta:\n"
+"%s"
+
+#: mail/mail-mt.c:179
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Əməliyyataparılırkən xəta oldu:\n"
+"%s"
+
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+msgid "Working"
+msgstr "İşləyir"
+
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
+
+#: mail/mail-ops.c:516
+#, c-format
+msgid "Sending \"%s\""
+msgstr "\"%s\" Göndərilir"
+
+#: mail/mail-ops.c:518
+msgid "Sending message"
+msgstr "İsmarıc göndərilir"
+
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "\"%s\" Qovluğundakı ismarıclar qeyd edilir"
+
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "İsmarıc(ları) buraya daşı "
+
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "İsmarıclar köçürülür"
+
+#: mail/mail-ops.c:842
+msgid "Moving"
+msgstr "Daşınır"
+
+#: mail/mail-ops.c:845
+msgid "Copying"
+msgstr "Köçürdülür"
+
+#: mail/mail-ops.c:856
+#, c-format
+msgid "%s message %d of %d (uid \"%s\")"
+msgstr "%s message %d of %d (uid \"%s\")"
+
+#: mail/mail-ops.c:927
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" dakı qovluqlar daranır"
+
+#: mail/mail-ops.c:1085
+msgid "Forwarded messages"
+msgstr "Çatdırılmış ismarıc"
+
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#, c-format
+msgid "Opening folder %s"
+msgstr "%s qovluğu açılır"
+
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "%s qovluğu açılır"
+
+#: mail/mail-ops.c:1380
+msgid "Expunging folder"
+msgstr "Qovluq açılır"
+
+#: mail/mail-ops.c:1429
+#, c-format
+msgid "Retrieving message %s"
+msgstr "%s ismarıcı alınır"
+
+#: mail/mail-ops.c:1496
+msgid "Retrieving messages"
+msgstr "İsmarıclar alınır"
+
+#: mail/mail-ops.c:1506
+#, c-format
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "%d nin %d ismarıcı alınır (uid \"%s\")"
+
+#: mail/mail-ops.c:1580
+msgid "Saving messages"
+msgstr "İsmarıclar qeyd edilir"
+
+#: mail/mail-ops.c:1659
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Nəticə faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: mail/mail-ops.c:1672
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "%d nin %d ismarıcı qeyd edilir (uid \"%s\")"
+
+#: mail/mail-ops.c:1686
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"İsmarıcların buraya qeyd edilmə xatası: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:1760
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#: mail/mail-ops.c:1775
+#, fuzzy, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Nəticə faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: mail/mail-ops.c:1803
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Data yazıla bilmədi: %s"
+
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Axtar"
+
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "Ləğv Et"
+
+#: mail/mail-send-recv.c:231
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "ePoçt Göndərilir"
+
+#: mail/mail-send-recv.c:234
+#, fuzzy
+msgid "Receiving"
+msgstr "Alındı"
+
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
+msgstr ""
+
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
+msgstr ""
+
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "\"%s\" Göndərilir"
+
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "Ləğv Et"
+
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "İşarətləmə qurtadı"
+
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
+msgstr "Borulamadan xəsərli bir ismarıc gəldi !"
+
+#: mail/mail-tools.c:138
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr "Müvəqqəti '%s' mboxu yaradıla bilmir: %s"
+
+#: mail/mail-tools.c:185
+#, c-format
+msgid "[%s] (forwarded message)"
+msgstr "[%s] (çatdırilmiş ismarıc)"
+
+#: mail/mail-tools.c:195
+msgid "Fwd: (no subject)"
+msgstr "Dvm: (mövzusuz)"
+
+#: mail/mail-tools.c:212
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Çatdırılmış ismarıc - %s"
+
+#: mail/mail-tools.c:214
+msgid "Forwarded message (no subject)"
+msgstr "Çatdırılmış ismarıc (mövzusuz)"
+
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr ""
+
+#: mail/mail-vfolder.c:248
+msgid "VFolders"
+msgstr "VFolderlər"
+
+#: mail/mail-vfolder.c:426
+msgid "New VFolder"
+msgstr "Yeni 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:38
+msgid "Reply"
+msgstr "Cavab ver"
+
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+msgid "Reply to the sender of this message"
+msgstr "İsmarıcı göndərene cavab ver"
+
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+msgid "Reply to all recipients of this message"
+msgstr "İsmarıcın bütün alıcılarına cavab ver"
+
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+msgid "Forward this message"
+msgstr "Bu ismarıcı çatdır"
+
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+msgid "Print the selected message"
+msgstr "Seçili ismarıcı çap et"
+
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+msgid "Delete this message"
+msgstr "Bu ismarıcı sil"
+
+#: mail/message-list.c:618
+msgid "Unseen"
+msgstr "Görülməmiş"
+
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Görülmüş"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Cavab cerilmiş"
+
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "İsmarıc göndərilə bilmədi: %s"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "İsmarıcları Gizlət"
+
+#: mail/message-list.c:952
+#, 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:964 mail/message-list.c:980
+#, c-format
+msgid "%s, et al."
+msgstr "%s, vs."
+
+#: mail/message-list.c:967 mail/message-list.c:983
+msgid "<unknown>"
+msgstr "<namə'lum>"
+
+#: mail/message-list.c:1035
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:1042
+msgid "Today %l:%M %p"
+msgstr "Bugün %l:%M %p"
+
+#: mail/message-list.c:1051
+msgid "Yesterday %l:%M %p"
+msgstr "Sabah: %l:%M %p"
+
+#: mail/message-list.c:1063
+msgid "%a %l:%M %p"
+msgstr "%a %l %M %p"
+
+#: mail/message-list.c:1071
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1073
+msgid "%b %d %Y"
+msgstr "%b %d %Y"
+
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Bayraqlı"
+
+#: mail/message-list.c:1172
+msgid "From"
+msgstr "Göndərən"
+
+#: mail/message-list.c:1172
+msgid "Date"
+msgstr "Tarix"
+
+#: mail/message-list.c:1172
+msgid "Received"
+msgstr "Alındı"
+
+#: mail/message-list.c:1173
+msgid "To"
+msgstr "Gn:"
+
+#: mail/message-list.c:1173
+msgid "Size"
+msgstr "Böyüklük"
+
+#: mail/openpgp-utils.c:89
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "%s üçün %s parol kalimanizi lürfən girin"
+
+#: mail/openpgp-utils.c:92
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Lürfan %s parol kəlimənizi girin"
+
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
+msgid "No GPG/PGP program available."
+msgstr "Heç bir GPG/PGP proqramı yoxdur"
+
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
+msgid "No password provided."
+msgstr "Parol istənmir"
+
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
+
+#: mail/openpgp-utils.c:588
+msgid "No recipients specified"
+msgstr "Alıcı bildirilməyib"
+
+#: mail/openpgp-utils.c:1088
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Müvəqqəti fayl yaradıla bilmir: %s"
+
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr "Qovluq"
+
+#: mail/subscribe-dialog.c:65
+msgid "Store"
+msgstr "Saxla"
+
+#: mail/subscribe-dialog.c:147
+msgid "Display folders starting with:"
+msgstr "Bunula başlayan qovluqları göstər:"
+
+#: mail/subscribe-dialog.c:177
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr "\"%s\" üçün saxlama aməliyyatı aparılır"
+
+#: mail/subscribe-dialog.c:280
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
+
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "\"%s\" qovluğuna qeydiyyat silinir"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Fayl adı :"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Qovluq"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:309
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "%s da(də) yeni məktub yoxdur."
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "Vacib"
+
+#: shell/importer/importer.c:327
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/importer/importer.c:342
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Fayl yüklərkən xəta oldu: %s"
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+#, fuzzy
+msgid "Automatic"
+msgstr "_Avtomarik Olaraq Seç"
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "Fayl adı :"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Imza faylını seç"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "Fayl adı :"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#, fuzzy
+msgid "Import"
+msgstr "Vacib"
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Evolution Hesab Düzəldicisi"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Evolution Hesab Düzəldicisi"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/e-setup.c:112 shell/e-setup.c:185
+msgid "Evolution installation"
+msgstr "Evolution qurulması"
+
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+"Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
+"bə'zi əlavə fayllar köçürməlidir"
+
+#: shell/e-setup.c:117
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
+"Lütfən \"Oldu\"'ya tıqlayıb, faylları qurun, ya da \"Ləğv Et\"ə "
+"basaraq çıxın."
+
+#: shell/e-setup.c:157
+msgid "Could not update files correctly"
+msgstr "Fayllar düzgün güncəllənə bilmədi"
+
+#: shell/e-setup.c:160 shell/e-setup.c:228
+msgid "Evolution files successfully installed."
+msgstr "Evolution faylları müvəffəqiyyətlə quruldu."
+
+#: shell/e-setup.c:189
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
+msgstr "Dəyəsən Evolutionı ilk dəfə işə salırsan."
+
+#: shell/e-setup.c:190
+msgid "Please click \"OK\" to install the Evolution user files under"
+msgstr "\"Oldu\"'ya tıqlayıb, Evolution istifadəçi fayllarını buraya qur"
+
+#: shell/e-setup.c:209
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+"%s qovluğunu yarada bilmədim\n"
+"\n"
+"Xəta : %s"
+
+#: shell/e-setup.c:224
+#, c-format
+msgid ""
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+"Faylları `%s''yə\n"
+"köçürdə bilmədim ."
+
+#: shell/e-setup.c:249
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+"`%s' bir qovluq deyildir.\n"
+"Evolution istifadəçi fayllarınin qurulması\n"
+"üçün onu sil."
+
+#: shell/e-setup.c:261
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"`%s' qovluğu mövcuddur, amma\n"
+"Evolution qovluğunda yerləşmir. Evolution \n"
+"istifadəçi fayllarınin qurulması üçün onu sil."
+
+#: shell/e-shell-folder-creation-dialog.c:96
+#, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Bildirilən qovluq yaradıla bilmədi:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:153
+msgid "The specified folder name is not valid."
+msgstr "Bildirilən qovluq adı hökmlü deyildir ."
+
+#: shell/e-shell-folder-creation-dialog.c:245
+msgid "Evolution - Create new folder"
+msgstr "Evolution - Yeni qovluq yarat"
+
+#: shell/e-shell-folder-selection-dialog.c:96
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+"Bildirilən gediş üçün bu seçili qovluq növü \n"
+"hökmlü deyildir ."
+
+#: shell/e-shell-folder-selection-dialog.c:318
+msgid "New..."
+msgstr "Yeni ..."
+
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+msgid "(Untitled)"
+msgstr "( Adsız )"
+
+#: shell/e-shell-view-menu.c:159
+msgid "Bug buddy was not found in your $PATH."
+msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
+
+#: shell/e-shell-view-menu.c:165
+msgid "Bug buddy could not be run."
+msgstr "Bug-buddy işə salına bilmədi."
+
+#: shell/e-shell-view-menu.c:194
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
+
+#: shell/e-shell-view-menu.c:196
+msgid ""
+"Evolution is a suite of groupware applications\n"
+"for mail, calendaring, and contact management\n"
+"within the GNOME desktop environment."
+msgstr ""
+"Evolution GNOME masa üstü üçün gözəl bir ePoçt, \n"
+"təqvim və əlaqələr idarə proqramıdır."
+
+#: shell/e-shell-view-menu.c:360
+msgid "Go to folder..."
+msgstr "Qovluğa get ..."
+
+#: shell/e-shell-view.c:143
+msgid "(No folder displayed)"
+msgstr "( Heç bir qovluq göstərilmir )"
+
+#: shell/e-shell-view.c:474
+msgid "Folders"
+msgstr "Qovluqlar"
+
+#: shell/e-shell-view.c:1124
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1126
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell.c:372
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
+
+#: shell/e-shell.c:1242
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Vaxsey! `%s' nömayişi gözlanilməz şakildə sonlandı. :-(\n"
+"Bu, %s qisminin çködüyünə işarət edir."
+
+#: shell/e-shortcuts-view.c:123
+msgid "Create new shortcut group"
+msgstr "Yeni bir qısa yol qrupu yarat"
+
+#: shell/e-shortcuts-view.c:126
+msgid "Group name:"
+msgstr "Qrup adı :"
+
+#: shell/e-shortcuts-view.c:249
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+"`%s' Qrupunu qısa yol çubuğundan həqiqətan \n"
+"də silmək istəyisiniz mi?"
+
+#: shell/e-shortcuts-view.c:254
+msgid "Don't remove"
+msgstr "Silmə"
+
+#: shell/e-shortcuts-view.c:265
+msgid "_Small Icons"
+msgstr "_Kiçik Timsallar"
+
+#: shell/e-shortcuts-view.c:266
+msgid "Show the shortcuts as small icons"
+msgstr "Qısa yolları kiçik timsallar olaraq göstər"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Large Icons"
+msgstr "_Böyük Timsallar"
+
+#: shell/e-shortcuts-view.c:269
+msgid "Show the shortcuts as large icons"
+msgstr "Qısa yolları böyük timsallar olaraq göstər"
+
+#: shell/e-shortcuts-view.c:280
+msgid "_New Group..."
+msgstr "_Yeni Qrup..."
+
+#: shell/e-shortcuts-view.c:281
+msgid "Create a new shortcut group"
+msgstr "Yeni bir qısa yol qrupu yarat"
+
+#: shell/e-shortcuts-view.c:283
+msgid "_Remove This Group..."
+msgstr "Bu Qrupu _Sil..."
+
+#: shell/e-shortcuts-view.c:284
+msgid "Remove this shortcut group"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr "Qısa yol Çubuğunu _Gizlət"
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr "Qısa yol Çubuğunu Gizlət"
+
+#: shell/e-shortcuts-view.c:374
+msgid "Activate"
+msgstr "Fəallaşdır"
+
+#: shell/e-shortcuts-view.c:374
+msgid "Activate this shortcut"
+msgstr "Bu qısa yolu fəallaşdırs"
+
+#: shell/e-shortcuts-view.c:377
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Bu qısa yolu qısa yol çubuğundan sil"
+
+#: shell/e-shortcuts.c:375
+msgid "Error saving shortcuts."
+msgstr "Qısa yolları qeyd edərkən xəta oldu."
+
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+msgid "_View"
+msgstr "_Göstər"
+
+#: shell/e-storage-set-view.c:468
+msgid "View the selected folder"
+msgstr "Seçili qovluğu göstər"
+
+#: shell/e-storage.c:178
+msgid "(No name)"
+msgstr "( Adsızdır )"
+
+#: shell/e-storage.c:429
+msgid "No error"
+msgstr "Xəta yoxdur"
+
+#: shell/e-storage.c:431
+msgid "Generic error"
+msgstr "Ümumi xəta"
+
+#: shell/e-storage.c:433
+msgid "A folder with the same name already exists"
+msgstr "Eyni adlı bir qovluq onsuz da var"
+
+#: shell/e-storage.c:435
+msgid "The specified folder type is not valid"
+msgstr "Bildirilən qovluq növü hökmlü deyildir"
+
+#: shell/e-storage.c:437
+msgid "I/O error"
+msgstr "G/Ç xətası"
+
+#: shell/e-storage.c:439
+msgid "Not enough space to create the folder"
+msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
+
+#: shell/e-storage.c:441
+msgid "The specified folder was not found"
+msgstr "Bildirilən qovluq tapıla bilmədi"
+
+#: shell/e-storage.c:443
+msgid "Function not implemented in this storage"
+msgstr "Funksiya yazılmamışdır"
+
+#: shell/e-storage.c:445
+msgid "Permission denied"
+msgstr "Qadağandır"
+
+#: shell/e-storage.c:447
+msgid "Operation not supported"
+msgstr "Əməliyyat dəstəklənmir"
+
+#: shell/e-storage.c:449
+msgid "The specified type is not supported in this storage"
+msgstr "Bu qeydlərdə belirtilen növ dəstəklənmir"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Evolution qabığını başlada bilmədim ."
+
+#: shell/main.c:73
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
+"\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Salam. Evolution qrup proqramının nümayiş buraxılışını sınamağa \n"
+"vaxt tapdığınız üçün minnətdarıq.\n"
+"\n"
+"Axırıncı bir ayda, Evolutionu istifadəsi asand hala gətirməyə "
+"çalışdıq.\n"
+"Evolutionun yazarlarının çoxu ( idealizm ? ) ePoçtlarını \n"
+"Evolution ilə oxuyub, yazmaqdadırlar . Sən də belə edə biləsən "
+"əlbətdə.\n"
+"( Sadəcə olaraq bir ehtiyat nüsxəsi çıxartmağı unutma . )\n"
+".\n"
+"Çox ağır xətaları və problemləri düzəltdik, amma xəbərdarlıq "
+"pəncərəsi hələ durur.\n"
+"Evolutionun mərifətlərini sayaq:\n"
+"çökmələr, ePoçt itkisi, ortada qalan yetim əməliyyatlar, %%100 "
+"əməliyyat işlədilməsi,\n"
+"donmalar, təsadüfi ePoçt siyahılarına göndərilmiş HTML ePoçtları "
+"və dostlarının\n"
+"və həmkarlarının qabağında utanmalar. Yəni riski sənə qalıb.\n"
+"\n"
+"Ağır bir işin nəticəsini bəyəndiyinizi ümid edib, sizin "
+"fikirlərinizi\n"
+"gözləyirik!\n"
+
+#: shell/main.c:98
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Minnətdarıq\n"
+"Evolution Dəstəsi\n"
+
+#: shell/main.c:129
+msgid "Cannot initialize the Evolution shell."
+msgstr "Evolution qabığını başlada bilmədim ."
+
+#: shell/main.c:175
+msgid "Disable."
+msgstr "Bağla."
+
+#: shell/main.c:195
+msgid "Cannot initialize the Bonobo component system."
+msgstr "Bonobo parçalar sistemini başlada bilmədim."
+
+#: ui/evolution-addressbook.xml.h:2
+#, fuzzy
+msgid "Create new contact"
+msgstr "Yeni bir qeyd yarat"
+
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
+msgstr "Əlaqəni sil"
+
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Axtar"
+
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
+msgstr "Bir əlaqəni axtar"
+
+#: ui/evolution-addressbook.xml.h:7
+#, fuzzy
+msgid "New contact"
+msgstr "Bütün əlaqələri göstər"
+
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "İsmarıcı sonra göndər"
+
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
+msgstr "Əlaqələri çap et"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#, fuzzy
+msgid "Stop"
+msgstr "Saxla"
+
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
+msgstr "Yükləməni Dayandır"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
+msgstr "Hamısını Göstər"
+
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
+msgstr "Bütün əlaqələri göstər"
+
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Ünvan Dəftəri Qaynağı"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Əlaqələr ..."
+
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Çap Et ..."
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Vasitələr"
+
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 gün"
+
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
+msgstr "Seçənəkləri dəyişdir"
+
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
+msgstr "Yeni bir təqvim yarat"
+
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "Gün"
+
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Get"
+
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
+msgstr "Vaxtda geri get"
+
+#: ui/evolution-calendar.xml.h:9
+msgid "Go forward in time"
+msgstr "Vaxtda irəli get"
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
+msgstr "Xüsusi bir tarixə get"
+
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to present time"
+msgstr "İndiki vaxta get"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Ay"
+
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
+msgstr "Yeni iclas ..."
+
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "İrəli"
+
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "Open Calendar"
+msgstr "_Təqvimi aç"
+
+#: ui/evolution-calendar.xml.h:17
+msgid "Prev"
+msgstr "Geri"
+
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Təqvimi çap et"
+
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Print this Calendar"
+msgstr "Bu təqvim çap et"
+
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+msgid "Save As"
+msgstr "Fərqli Qeyd Et"
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "1 günü göstər"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "1 ayı göstər"
+
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "2 həftəni öster"
+
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "İş həftəsini göstər"
+
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Bugün"
+
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Həftə"
+
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "İclaslar:"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Yeni"
+
+#: ui/evolution-calendar.xml.h:34
+msgid "_Open Calendar"
+msgstr "_Təqvimi aç"
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "Fərqli _Qeyd Et ..."
+
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Bu üzvü sil"
+
+#: ui/evolution-contact-editor.xml.h:3
+msgid "Delete..."
+msgstr "Sil..."
+
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
+msgstr "Kömək"
+
+#: ui/evolution-contact-editor.xml.h:5
+msgid "Print En_velope..."
+msgstr "_Zərfi Çap Et..."
+
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr "Bu üzvü çap et"
+
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr "Çap Et ..."
+
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+msgid "Save _As..."
+msgstr "_Fərqli Qeyd Et ..."
+
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr "Qeyd Et və Qapat"
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr "Əlaqəni qeyd et və dialoqu qapat"
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Köməyə bax"
+
+#: ui/evolution-contact-editor.xml.h:13
+msgid "Send _message to contact..."
+msgstr "Əlaqəyə yeni bir _ismarıc göndər..."
+
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Fayl"
+
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr "_Qeyd Et ..."
+
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+#, fuzzy
+msgid "About this application"
+msgstr "Tanıtma"
+
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr "Haqqında..."
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
+msgstr "Gediş_lər"
+
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#, fuzzy
+msgid "Address _Book... (FIXME)"
+msgstr "ABY : Ünvan _Dəftəri ..."
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+msgid "C_lear"
+msgstr "Tə_mizlə"
+
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "Kə_s"
+
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#, fuzzy
+msgid "Chec_k Names (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+msgid "Clear"
+msgstr "Təmizlə"
+
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#, fuzzy
+msgid "Clear the selection"
+msgstr "Seçili qovluğu göstər"
+
+#: ui/evolution-event-editor.xml.h:11
+msgid "Close this appointment"
+msgstr "Bu iclası qapat"
+
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#, fuzzy
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Qovluğa Köçür..."
+
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Köçürt"
+
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Kəs"
+
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Bu iclası sil"
+
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#, fuzzy
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "ABY : Qovluqdakı _İlk Üzv"
+
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#, fuzzy
+msgid "For_ward (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:23
+#, fuzzy
+msgid "Forward as v_Calendar (FIXME)"
+msgstr "ABY : v_Calendar Şəklində göndər"
+
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
+msgstr "İrəlidəki Üzvə Get"
+
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "Daldakı Üzvə Get"
+
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#, fuzzy
+msgid "In_complete Task (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
+msgstr "Faylların seçənəklərini təkmilləşdir"
+
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr "_Sonrakı"
+
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "Yapışdır"
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "Ara yaddaşı yapışdır"
+
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "_Geri"
+
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Əvvəlki"
+
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Çap Etmə nümayişi"
+
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr "Çap _Qurğuları..."
+
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+msgstr "Çap Qurğuları"
+
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Qeyd Et"
+
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr "İclası qeyd et və dialoqu qapat"
+
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
+msgstr "Hazırkı faylı qeyd et"
+
+#: ui/evolution-event-editor.xml.h:46
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+msgid "Select All"
+msgstr "Hamısını Seç"
+
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#, fuzzy
+msgid "Select everything"
+msgstr "Qovluq Seçin"
+
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+msgid "_About..."
+msgstr "_HAqqında..."
+
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Qapat"
+
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+msgid "_Contact (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "_Köçürt"
+
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+msgid "_Help"
+msgstr "_Kömək"
+
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "ABY : Qovluqdakı _Axırıncı Üzv"
+
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "e_Posta ismarıcı"
+
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "Qovluğa _Daşı ..."
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "_Yapışdır"
+
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Çap Et"
+
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+msgid "_Properties..."
+msgstr "_Seçənəklər..."
+
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "Hamısını Seç"
+
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "Qaynaq Əlavə Et"
+
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "Yeni bir qeyd yarat"
+
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
+
+#: ui/evolution-executive-summary.xml.h:5
+#, fuzzy
+msgid "New Mail"
+msgstr "ePoçt Al"
+
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
+msgstr "Yaz"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Compose a new message"
+msgstr "Yeni bir ePoçt ismarıcı yaz"
+
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
+msgstr "İsmarıcları yeni bir qovluğa daşı"
+
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "İsmarıcdan Qayda Yarat"
+
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Boş günler :"
+
+#: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Göndərəndəki  Süzgəc"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Alıcıdakı Süzgəc"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Mövzudakı Süzgəc"
+
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
+msgstr "_Parolaları unut"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Forward As"
+msgstr "Davam etdir"
+
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "Başlıq"
+
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "S_eçiliİsmarıcları Gizlət"
+
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "_Silinmiş İsmarıcları Gizlət"
+
+#: ui/evolution-mail.xml.h:21
+msgid "Hide _Read messages"
+msgstr "_Oxunmuş İsmarıcları Gizlət"
+
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Inline"
+msgstr "İçərisini Göstər"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Qeydiyyatları İdarə Et..."
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Oxunmış olaraq işarətlə"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Oxunmış olaraq işarətlə"
+
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Oxunmamış olaraq işarətlə"
+
+#: ui/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Message _Display"
+msgstr "İsmarıcların nümayişini təmizlə"
+
+#: ui/evolution-mail.xml.h:28
+msgid "Move"
+msgstr "Daşı"
+
+#: ui/evolution-mail.xml.h:29
+msgid "Move message to a new folder"
+msgstr "İsmarıcı yeni bir qovluğa daşı"
+
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Qeyd"
+
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "_Hamısına Cavab Ver"
+
+#: ui/evolution-mail.xml.h:43
+#, fuzzy
+msgid "S_ource"
+msgstr "Qaynaq"
+
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "_Hamısını Seç"
+
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "_Hamısını Seç"
+
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Hamısını Göstər"
+
+#: ui/evolution-mail.xml.h:50
+msgid "Threaded Message list"
+msgstr "Xəsərli İsmarıcları Siyahısı"
+
+#: ui/evolution-mail.xml.h:51
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Göndərəndəki vFolder"
+
+#: ui/evolution-mail.xml.h:52
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Alıcıdakı vFolder"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Mövzudakı vFolder"
+
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtual Qovluq Düzəldicisi..."
+
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Gedişlər"
+
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr "Süzgəcləri Ə_lavə Et"
+
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Yaz"
+
+#: ui/evolution-mail.xml.h:59
+msgid "_Copy to Folder..."
+msgstr "Qovluğa _Köçürt..."
+
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "İsmarıcdan Qayda Yarat"
+
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr "_Təmizlə"
+
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "ePoçt _Süzgəcləri ..."
+
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Qovluq"
+
+#: ui/evolution-mail.xml.h:65
+msgid "_Forward"
+msgstr "_Çatdır"
+
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "ABY : e_Poçt İsmarıcı"
+
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Qurğular"
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
+msgstr "_İsmarıc"
+
+#: ui/evolution-mail.xml.h:70
+msgid "_Move to Folder..."
+msgstr "Qovluğa _Daşı ..."
+
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Vəzifəni aç"
+
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:77
+msgid "_Undelete"
+msgstr "_Geri Gətir"
+
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Yapışdır"
+
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+#, fuzzy
+msgid "Close the current file"
+msgstr "Hazırkı faylı qeyd et"
+
+#: ui/evolution-message-composer.xml.h:5
+msgid "Encrypt this message with PGP"
+msgstr "İsmarıcı PGP ilə kodla"
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "Şəki_l"
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr "HTML"
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr "Bir faylı mətn olaraq ismarıca əlavə et"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr "_Matn faylını daxil et ... "
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Fayl aç"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save in _folder... (FIXME)"
+msgstr "_Qovluqda Qeyd Et ... (ABY)"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save in folder..."
+msgstr "_Qovluqda qeyd et ..."
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr "Hazırkı faylı fərqli bir ad altında qeyd et"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr "İsmarıcı bildirilən qovluqda qeyd et"
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr "Göndər"
+
+#: ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send _Later"
+msgstr "Göndərən"
+
+#: ui/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _later"
+msgstr "Göndərən"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr "ePoçtyı HTML Şəklində göndər"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send the message later"
+msgstr "İsmarıcı sonra göndər"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send the message now"
+msgstr "İsmarıcı indi göndər"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send this message now"
+msgstr "Bu ismarıcı indi göndər"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Show / hide attachments"
+msgstr "Yapşdırılmış faylları göstər/gizlət"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Show _attachments"
+msgstr "_Yapşdrılmış Faylları göstər"
+
+#: ui/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show attachments"
+msgstr "_Yapşdrılmış Faylları göstər"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr "İsmarıcı fərqli bir ad altında qeyd et"
+
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
+
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
+
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "_Bcc Field"
+msgstr "Vahidlər"
+
+#: ui/evolution-message-composer.xml.h:40
+#, fuzzy
+msgid "_Cc Field"
+msgstr "Vahidlər"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Daxil Et"
+
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr "_Mətn faylını daxil et ... ( ABY )"
+
+#: ui/evolution-message-composer.xml.h:49
+msgid "_Open..."
+msgstr "_Aç ..."
+
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Cavab ver"
+
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Qovluq"
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:8
+#, fuzzy
+msgid "Subscribe"
+msgstr "Alt Ağac"
+
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:5
+#, fuzzy
+msgid "Assig_n Task (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:29
+#, fuzzy
+msgid "Meeting Re_quest (FIXME)"
+msgstr "ABY : İclas is_təyi"
+
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr "Təzədən Et"
+
+#: ui/evolution-task-editor-dialog.xml.h:44
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Gedişi sil"
+
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr "Dəyişdir"
+
+#: ui/evolution-task-editor-dialog.xml.h:46
+#, fuzzy
+msgid "Replace a string"
+msgstr "Dəyişdir"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
+#, fuzzy
+msgid "Reply to A_ll (FIXME)"
+msgstr "Hamısına cavab ver"
+
+#: ui/evolution-task-editor-dialog.xml.h:48
+#, fuzzy
+msgid "S_end Status Report (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:54
+#, fuzzy
+msgid "Save the task and close the dialog box"
+msgstr "Əlaqəni qeyd et və dialoqu qapat"
+
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:61
+#, fuzzy
+msgid "Undo"
+msgstr "_Geriyə Al"
+
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+msgid "_Appointment (FIXME)"
+msgstr "_Görüş (ABY)"
+
+#: ui/evolution-task-editor-dialog.xml.h:77
+#, fuzzy
+msgid "_Mark Complete (FIXME)"
+msgstr "İşarətləmə qurtadı"
+
+#: ui/evolution-task-editor-dialog.xml.h:84
+#, fuzzy
+msgid "_Reply (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Create a new task"
+msgstr "Yeni bir qeyd yarat"
+
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "New Task"
+msgstr "Vəzifə"
+
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Tasks Preferences..."
+msgstr "Təqvim Seçənəkləri..."
+
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Vəzifə"
+
+#: ui/evolution.xml.h:1
+#, fuzzy
+msgid "About Evolution..."
+msgstr "_Evolution JHaqqında..."
+
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Close this window"
+msgstr "Bu iclası qapat"
+
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution.xml.h:5
+#, fuzzy
+msgid "Customize"
+msgstr "ABY : _Xüsusiləşdir..."
+
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr "Başqa bir qovluğu göstər"
+
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr "Çı_x"
+
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr "Evolution çubuğu _qısa yolu"
+
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr "Ne_cə Başlayaram"
+
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr "Evolution haqqında mə'lumat göstər"
+
+#: ui/evolution.xml.h:15
+#, fuzzy
+msgid "Submit Bug Report"
+msgstr "_Xəta Raportunu Göndər"
+
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "_Xəta Raportunu Göndər"
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr "Bug-buddy dəstəyi ilə bir xəta raportunu göndər"
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
+
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyi yeri bildir"
+
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr "Ə_laqələr İdarəcisini Necə işlədim"
+
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr "_Təqvimi Necə İşlədim"
+
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr "_ePoçt bölməsini necə İşlədim"
+
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "İşləyir"
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr "_Evolution JHaqqında..."
+
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
+msgstr "_Qovluq"
+
+#: ui/evolution.xml.h:32
+msgid "_Go to Folder..."
+msgstr "Qovluğa _Get ..."
+
+#: ui/evolution.xml.h:34
+#, fuzzy
+msgid "_Import file..."
+msgstr "_Matn faylını daxil et ... "
+
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr "_İndeks"
+
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Mail message"
+msgstr "e_Posta ismarıcı"
+
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Yeni VFolder"
+
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Qısa yol Çubuğunu _Gizlət"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+msgid "%A, %B %d, %Y"
+msgstr "%a %B %d %Y"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Məşğul"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "İş Yerində Deyil"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Mə'lumat Yoxdur"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "Başqalarını _Dəvət Et ..."
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Seçənəklər"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "_Uzaqlaşdıraraq Göstər"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "Boş/Məşğulları _Təzələ"
+
+#: 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 "_Avtomarik Olaraq Seç"
+
+#: 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 "_Bütün Adamlar və Qaynaqlar"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Bütün _adamlar və Bir Qaynaq"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_Lazımi Adamlar"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Lazımi Adamlar və _Bir Qaynaq"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "İclas başlama saatı :"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "İclas sonlanma saatı :"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Bütün Ziyarətçilər"
+
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "indiki vaxt"
+
+#. 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:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "İndi"
+
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: 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"
+
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Axtar"
+
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Ətraflı"
+
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Ətraflı..."
+
+#: widgets/misc/e-messagebox.c:141
+#, fuzzy
+msgid "Information"
+msgstr "Mə'lumat Yoxdur"
+
+#: widgets/misc/e-messagebox.c:148
+#, fuzzy
+msgid "Warning"
+msgstr "İşləyir"
+
+#: widgets/misc/e-messagebox.c:162
+#, fuzzy
+msgid "Question"
+msgstr "İzah :"
+
+#: widgets/misc/e-messagebox.c:169
+#, fuzzy
+msgid "Message"
+msgstr "_İsmarıc"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Bu ismarıcı indi göndər"
+
+#: widgets/misc/e-search-bar.c:140
+msgid "Sear_ch"
+msgstr "Ax_tar"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#, fuzzy
+msgid "The Personal Addressbook Server"
+msgstr "Ünvan Dəftəri Qaynağı"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:153
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "GNOME başladıla bilmədi"
+
+#: wombat/wombat.c:165
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "GNOME başladıla bilmədi"
+
+#: wombat/wombat.c:178
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Bonoboyu başlada bilmədim"
+
+#~ msgid "Reflow Test"
+#~ msgstr "Təzədən Axış Sınağı"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Təlif haqqı (C) 2000 Helix Code, Inc."
+
+#~ msgid "This should test the reflow canvas item"
+#~ msgstr "Bu sınaq bütün tualı təzədən axıtmalıdır"
+
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX mbox-format məktub faylları"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Yerli sistem tərəfindən gətirilən mektubları oxumaq və məktubların "
+#~ "yerli faylları üçün diskdə saxlamaq üçün."
+
+#~ msgid "Connecting to server"
+#~ msgstr "Vericiyə bağlanılır"
+
+#~ msgid "Connect to server"
+#~ msgstr "Vericiyə Bağlan"
+
+#~ msgid "New"
+#~ msgstr "Yeni"
+
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Evolutionun qeyd parçasını başlada bilmədim ."
+
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Qeydlər parçası : Bonoboyu başlada bilmədim"
+
+#~ msgid "Disabled"
+#~ msgstr "Passivləşdirilmiş"
+
+#~ msgid "Synchronize"
+#~ msgstr "Sinxronlaşdır"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Pilotdan Köçürt"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Pilota Köçürt"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Pilotdan Birləşdir"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Pilota Birləşdir"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Əsl Müəllif:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Əməliyyatı Sinxronlaşdır"
+
+#~ msgid "Conduit state"
+#~ msgstr "Ləvazimat Halı"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Heç pilot quraşdırılmayıb, lütfən\n"
+#~ "əvvəlcə 'Pilot Bağı Xüsusiyyələri' kappletini seçin."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Gnome-pilot vasitəsinə bağlanılmayıb"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Gnome-pilot vasitəsindən pilot siyahısı alınırkən\n"
+#~ "xəta oldu"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution Təqvim"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Evolution təqvimi üçün quraşdırıcı vasitə.\n"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution Ediləcəklər Əlavəsi"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr ""
+#~ "Evolution Ediləcəklər vasitəsi üçün quraşdırma ləvazimatı.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr ""
+#~ "Sayılar ikisi də daxil olam üzərə 1 ilə 9 arasında olmalıdır"
+
+#~ msgid "Open..."
+#~ msgstr "Aç ..."
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Bu iclası düzəlt .."
+
+#~ msgid "Local stores do not have a default folder"
+#~ msgstr "Yerli saxlamaların varsayılan qovluğu yoxdur"
+
+#~ msgid "Local folders may not be nested."
+#~ msgstr "Yerli qovluqlar yuva sala bilməzlər."
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr ""
+#~ "İsmarıcın göndərildiği adamı təsvir edən istədiyin adı buraya gir"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "İsmarıcın mövzusunu bildir"
+
+#~ msgid "Saving changes to message..."
+#~ msgstr "İsmarıcı edilən dəyişikliklər qeyd edilir..."
+
+#~ msgid "Save changes to message..."
+#~ msgstr "İsmarıca edilən dəyişiklikləri qeyd et..."
+
+#~ msgid "Error saving composition to 'Drafts': %s"
+#~ msgstr "İmlanın 'Lahiyələr'ə qeyd etmə xətası oldu: %s"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Süzgəc Qayadasını Düzəlt"
+
+#~ msgid "outgoing"
+#~ msgstr "gedən"
+
+#~ msgid "Failed to perform regex search on message header: %s"
+#~ msgstr "İsmarıc başlığında regex axtarması bacarılmadı: %s"
+
+#~ msgid "Add Rule"
+#~ msgstr "Qayda əlavə et"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "VFolder Qaydası Əalvə Et"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "VFolder Qaydasını Düzəlt"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Daxil edən mövzu və ya bədən"
+
+#~ msgid "Body contains"
+#~ msgstr "Daxil edən bədən"
+
+#~ msgid "Subject contains"
+#~ msgstr "Daxil edən mövzu"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Daxil etməyən bədən"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Daxil etməyən mövzü"
+
+#~ msgid "You have no Outbox configured"
+#~ msgstr "Hələ Gedənlər qutusunu quraşdırmamısan"
+
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s faylı açıla bilmədi:\n"
+#~ "%s"
+
+#~ msgid "Registering local folder"
+#~ msgstr "Yerli qovluq qeydiyyatdan keçirilir"
+
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s' Qovluğu qeydiyyatdan keçirilə bilmədi:\n"
+#~ "%s"
+
+#~ msgid "Fetching email from %s"
+#~ msgstr "%s dan(dən) ePoçt alınır"
+
+#~ msgid "Fetch email from %s"
+#~ msgstr "%s dan(dən) ePoçtu al"
+
+#~ msgid "Filtering email on demand"
+#~ msgstr "Məktublar süzülür"
+
+#~ msgid "Filter email on demand"
+#~ msgstr "Məktubları süz"
+
+#~ msgid "Sending queue"
+#~ msgstr "Müraciət göndərilir"
+
+#~ msgid "Send queue"
+#~ msgstr "Müraciəti göndər"
+
+#~ msgid "Appending \"%s\" "
+#~ msgstr " \"%s\" Əlavə Edilir"
+
+#~ msgid "Appending a message without a subject"
+#~ msgstr "Mövzusuz ismarıc əlavə edilir"
+
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Məktublar \"%s\" dan(dən) \"%s\" a(ə) daşınır"
+
+#~ msgid "Copying messages from \"%s\" into \"%s\" "
+#~ msgstr "Məktublar \"%s\" dan(dən) \"%s\" a(ə) köçürdülür"
+
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Məktubları \"%s\" dan(dən) \"%s\" a(ə) daşı"
+
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Məktubları \"%s\" dan(dən) \"%s\" a(ə) köçürt"
+
+#~ msgid "(No description)"
+#~ msgstr "(İzahatsız)"
+
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "%s üçün %s Qovluğu Yüklənir"
+
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "%s üçün %s Qovluğunu Yüklə"
+
+#~ msgid ""
+#~ "Error while preparing to %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s a(ə) hazırlanarkən xəta oldu:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s' sırasında xəta oldu:\n"
+#~ "%s"
+
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "Mövzu düzülüşü sərəncamlarla oxurkən xəta oldu ."
+
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr ""
+#~ "Mövzu düzülüşünü ayırdırkən bir ismarıc xəsərli mi çıxdı ?"
+
+#~ msgid "Could not create dialog box."
+#~ msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#~ msgid "User cancelled query."
+#~ msgstr "Soruşdurmanı istifadəçi dayandırdı ."
+
+#~ msgid "Examining %s"
+#~ msgstr "%s tədqiq edilir"
+
+#~ msgid ""
+#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
+#~ msgstr ""
+#~ "\"%s\" UID yaddaş faylı oxuna bilmədi.İsmarıcları cüt ala bilərsiniz."
+
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "%d nin(nın) %d ismarıcı alınır"
+
+#~ msgid "Writing message %d of %d"
+#~ msgstr "%d nin(nın) %d ismarıcı yazılır"
+
+#~ msgid "Saving changes to %s"
+#~ msgstr "%s a(ə) dəyişiklikllər qeyd edilir"
+
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s' yeri açıla bilmir:\n"
+#~ "%s"
+
+#~ msgid "Get store for \"%s\""
+#~ msgstr "\"%s\" üçün saxlama aməliyyatı apar"
+
+#~ msgid "Subscribe to folder \"%s\""
+#~ msgstr "\"%s\" qovluğuna qeyd ol"
+
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "\"%s\" qovluğundan qeyd silinir"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "ABY : _Görüş"
+
+#~ msgid "FIXME: _Contact"
+#~ msgstr "ABY : _Əlaqələr"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "ABY : _Vəzifə"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "ABY : Vəzifə _istəyi"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "ABY : Gü_ndəlik Üzvü"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "ABY : _Qeyd"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "ABY : Seçmə _formu ..."
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "ABY : _Xatirə Tərzi"
+
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "ABY : Çap Etmə _Tərzlərini Bildirin"
+
+#~ msgid "FIXME: S_end"
+#~ msgstr "ABY : Gö_ndər"
+
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "ABY : Yapış_dırılmış faylları qeyd et..."
+
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "ABY : Qovluğq _Daşı ..."
+
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "ABY : Qovluğa _Köçür..."
+
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "ABY : Çap Etmə Nüma_yişi"
+
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "ABY : _Xüsusi Yapışdır ..."
+
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "ABY : _Oxunmamış Olaraq İşarətlə"
+
+#~ msgid "_Object"
+#~ msgstr "_Cism"
+
+#~ msgid "FIXME: _Item"
+#~ msgstr "ABY : _Üzv"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "ABY : _Oxunmamış Üzv"
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "ABY : _Standart"
+
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "ABY : __Şəkilləndirmə"
+
+#~ msgid "Ne_xt"
+#~ msgstr "_İrəli"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Vasitə Çubuqları"
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "ABY : _Fayl ..."
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "ABY : Ü_zv..."
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "ABY : _Cism..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "ABY : _Yazı növü ..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "ABY : _Paraqraf..."
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "ABY : Bu Formu _Yarat"
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "ABY : _Bir Form Yarat..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "ABY : _Formu Yay..."
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "ABY : Formu fər_qli Yay..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "ABY : Yoxlama _Xəta  Ayıqlayıcısı"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "ABY : _Imla ..."
+
+#~ msgid "_Forms"
+#~ msgstr "_Şəkillər"
+
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "ABY : _Yeni Əlaqə"
+
+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "ABY : Eyni Şi_rkətdən Yeni Bir Əlaqə"
+
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "ABY : Əlaqəyə Yeni Bir _Məktub"
+
+#~ msgid "FIXME: New _Message to Contact"
+#~ msgstr "ABY : Əlaqəyə Yeni Bir _Məktub"
+
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "ABY : Əlaqə İlə Yeni Bir G_örüş"
+
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "ABY : _Bir İclası Planla..."
+
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "ABY : Əlaqə üçün Yeni Bir _Vəzifə"
+
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "ABY : Əlaqə üçün Yeni Bir _Gündəlik Üzvü"
+
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "ABY : Çatdırmaq Üçün İşarətlə ..."
+
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "ABY : _Ünvanın Xəritasini Göstər"
+
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "ABY : _Web Səhifəsini Aç"
+
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "ABY : v_Kart Şəklində Çatdır"
+
+#~ msgid "FIXME: For_ward"
+#~ msgstr "ABY : _Çatdır"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "ABY : Geri"
+
+#~ msgid "FIXME: Next"
+#~ msgstr "ABY : İrəli"
+
+#~ msgid "Group %i"
+#~ msgstr "Qrup %i"
+
+#~ msgid "label26"
+#~ msgstr "etiket26"
+
+#~ msgid "Days"
+#~ msgstr "Gün"
+
+#~ msgid "Hours"
+#~ msgstr "Saat"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Məktub _göndər"
+
+#~ msgid "Minutes"
+#~ msgstr "Dəqiqə"
+
+#~ msgid "Time"
+#~ msgstr "Vaxt"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Mail"
+#~ msgstr "_Məktub"
+
+#~ msgid "label21"
+#~ msgstr "etiket121"
+
+#~ msgid "Show all hidden"
+#~ msgstr "Bütün gizliləri göstər"
+
+#~ msgid "Hide deleted"
+#~ msgstr "Silinmişləri gizlət"
+
+#~ msgid "Hide Subject"
+#~ msgstr "Mövzunu Gizlət"
+
+#~ msgid "Hide from Sender"
+#~ msgstr "Göndərəndən Gizlət"
+
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "\"%s\" Mövzusunu Gİzlət"
+
+#~ msgid "Account Properties"
+#~ msgstr "Hesab Xüsusiyyətləri"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "ePoçt Ünvanı: "
+
+#~ msgid "Reply-to:"
+#~ msgstr "Cavab ver:"
+
+#~ msgid "Servers"
+#~ msgstr "Vericilər"
+
+#~ 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öndərdiyin ePoçtlarda istifadə ediləcək ad və ePoçt ünvanını "
+#~ "bildir. Və istəyirsənsə üzv olduğun quruluşun adını və imza faylı "
+#~ "olaraq istifadə ediləcək faylın adını bildirə bilərsiniz."
+
+#~ msgid "Full name:"
+#~ msgstr "Tam adı :"
+
+#~ msgid "Signature File"
+#~ msgstr "Imza Faylı"
+
+#~ msgid "Server:"
+#~ msgstr "Verici :"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Dəstəklənən növləri sına..."
+
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Vericidan ismarıcları silmə"
+
+#~ msgid "Mail source type:"
+#~ msgstr "ePoçt qaynağı növü"
+
+#~ 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 ""
+#~ "ePoçt vericisinin metodunu seç və lazımi mə'lumatları da ver. \n"
+#~ "\n"
+#~ "Verici bir izahat gözləyirsə onda \"Dəstəklənən növləri sına...\" "
+#~ "düyməsinə o biri mə'lumatları verdikdən sonra basa bilərsən ."
+
+#~ msgid "News source type:"
+#~ msgstr "Yeni qaynaq növü:"
+
+#~ 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 ""
+#~ "İstifadə ediləcək xəbər vericisini seç və bütün lazımi "
+#~ "mə'lumatları ver\n"
+#~ "\n"
+#~ "Verici bir izahat gözləyirsə onda \"Dəstəklənən növləri sına...\" "
+#~ "düyməsinə o biri mə'lumatları verdikdən sonra basa bilərsən ."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "ePoçt göndərilmə növü:"
+
+#~ 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 ""
+#~ "ePoçt vericisinin metodunu seç və lazımi mə'lumatları də ver. \n"
+#~ "\n"
+#~ "Verici bir izahat gözləyirsə onda \"Dəstəklənən növləri sına...\" "
+#~ "düyməsinə o biri mə'lumatları verdikdən sonra basa bilərsən ."
+
+#~ msgid "Add Identity"
+#~ msgstr "Kimlik Əlavə Et"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Kimliyi Düzəlt"
+
+#~ msgid "Edit Source"
+#~ msgstr "Kaynağı Düzəlt"
+
+#~ msgid "Add News Server"
+#~ msgstr "Xəbər Vericisi Əlavə Et"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Xəbər Vericisini Düzəlt"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "\"%s\" Sınanır"
+
+#~ msgid "Identities"
+#~ msgstr "Kimliklər"
+
+#~ msgid "Mail Sources"
+#~ msgstr "ePoçt Qaynaqları"
+
+#~ msgid "Mail Transport"
+#~ msgstr "ePoçt Göndərilməsi"
+
+#~ msgid "News Servers"
+#~ msgstr "Xəbər Vericiləri"
+
+#~ msgid "News Sources"
+#~ msgstr "Xəbər Qaynaqları"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "ePoçtu HTML Şəklində göndər"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_Ünvan Dəftəri Quraşdırılması..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "Əlaqələri _Çap Et..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Tə_qvim"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Bir təqvim aç"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "Bu təqvimi _çap et"
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "ABY : Adları Yoxla"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "ABY : Kömək"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "ABY : Na_tamam Vəzifə"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "ABY : Fayl Daxil Et"
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "ABY : _Qaynaqlar ..."
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "ABY : _Yeni iclas"
+
+#~ msgid "_Find..."
+#~ msgstr "_Axtar..."
+
+#~ msgid "_Redo"
+#~ msgstr "_Təzədən Et"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Dəyişdir..."
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oxun_mamış Olaraq İşarətlə"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "İsmarıcın Nümayişini çap et..."
+
+#~ msgid "Print message..."
+#~ msgstr "İsmarıcı çap et ..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "_Göndərənə Cavab Ver"
+
+#~ msgid "Show _All messages"
+#~ msgstr "_Bütün İsmarıcları Göndər"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_İsmarıcları Düzəlt"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_ePoçt Qurğuları ..."
+
+#~ msgid "_Print Message"
+#~ msgstr "İsmarıcı Ça_p Et"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "İsmarıcları _Fərqli Qeyd Et ..."
+
+#~ msgid "_Source"
+#~ msgstr "_Qaynaq"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "_Qovluqlar Çubuğunu Göstər"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Mövcud Kateqoriyalar :"
+
+#~ msgid "Port Number:"
+#~ msgstr "Qapı Nöm:. :"
+
+#~ msgid "Outline:"
+#~ msgstr "Xarici Görünüş:"
+
+#~ msgid "Headings:"
+#~ msgstr "Başlıqlar :"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "İşıqlandırılmış gün :"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Gün miqdarı :"
+
+#~ msgid "Current day's number:"
+#~ msgstr "İndiki günün nömrəsi :"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Daha edilməmiş \"Planlarım\" üzvü :"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Bugün ediləcək olan \"Planlarım\" üzvü :"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Vaxtı keçmiş \"Planlarım\" üzvü :"
+
+#~ msgid "may"
+#~ msgstr "may"
+
+#~ msgid "sunday"
+#~ msgstr "bazar"
+
+#~ msgid "monday"
+#~ msgstr "bazar ertəsi"
+
+#~ msgid "tuesday"
+#~ msgstr "çərşənbə axşamı"
+
+#~ msgid "tues"
+#~ msgstr "çaxş."
+
+#~ msgid "wednesday"
+#~ msgstr "çərşənbə"
+
+#~ msgid "wednes"
+#~ msgstr "çşb."
+
+#~ msgid "thursday"
+#~ msgstr "cümə axşamı"
+
+#~ msgid "thur"
+#~ msgstr "caxş."
+
+#~ msgid "thurs"
+#~ msgstr "caxş."
+
+#~ msgid "friday"
+#~ msgstr "cümə"
+
+#~ msgid "saturday"
+#~ msgstr "şənbə"
+
+#~ msgid "fortnight"
+#~ msgstr "gece"
+
+#~ msgid "min"
+#~ msgstr "dəq."
+
+#~ msgid "sec"
+#~ msgstr "san."
+
+#~ msgid "tomorrow"
+#~ msgstr "sabah"
+
+#~ msgid "yesterday"
+#~ msgstr "dünən"
+
+#~ msgid "today"
+#~ msgstr "bugün"
+
+#~ msgid "last"
+#~ msgstr "axırıncı"
+
+#~ msgid "this"
+#~ msgstr "bu"
+
+#~ msgid "next"
+#~ msgstr "irəli"
+
+#~ msgid "first"
+#~ msgstr "ilk"
+
+#~ msgid "third"
+#~ msgstr "üçüncü"
+
+#~ msgid "fourth"
+#~ msgstr "dördüncü"
+
+#~ msgid "fifth"
+#~ msgstr "beşinci"
+
+#~ msgid "sixth"
+#~ msgstr "altıncı"
+
+#~ msgid "seventh"
+#~ msgstr "yeddinci"
+
+#~ msgid "eighth"
+#~ msgstr "sekkizinci"
+
+#~ msgid "ninth"
+#~ msgstr "doqquzuncu"
+
+#~ msgid "tenth"
+#~ msgstr "onuncu"
+
+#~ msgid "eleventh"
+#~ msgstr "onbirinci"
+
+#~ msgid "twelfth"
+#~ msgstr "onikinci"
+
+#~ msgid "ago"
+#~ msgstr "əvvəl"
+
+#~ msgid "Year:"
+#~ msgstr "İl :"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Getmək istədiyin tarixi bildir.\n"
+#~ "Bir günə tıqladığın vaxt, o tarixə\n"
+#~ "gedəcəksən."
+
+#~ msgid "Mail Source"
+#~ msgstr "ePoçt qaynağı"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "\"%s\"i(ı) Təmizlə"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "\"%s\" Qovluğundaku ismarıclar işarətlənir"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "\"%s\" Qovluğundaku ismarıcları işarətlə"
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "\"%s\"dan(dən) ismarıc yapışdır"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "\"%s\" ismarıcını çatdır"
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "\"%s\" Yüklənir"
+
+#~ msgid "Clearing message display"
+#~ msgstr "İsmarıcların nümayişi təmizlənir"
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "\"%s\" Qovluğundakı ismarıcları qeyd et"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "_Yeni qovluq Vericisi"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "Təqvimi Fərqli _Qeyd Et"
+
+#~ msgid "_Mail Configuration"
+#~ msgstr "_ePoçt Quraşdırılması"
+
+#~ msgid "Insert a file as an attachment"
+#~ msgstr "Bir faylı yapışdırılmış fayl olaraq əlavə et"
+
+#~ msgid "window2"
+#~ msgstr "pəncərə2"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome Təqvimi"
+
+#~ msgid "The GNOME personal calendar and schedule manager."
+#~ msgstr "GNOME şəxsi təqvim və cədvəl idarəcisi."
+
+#~ msgid "Year"
+#~ msgstr "İl"
+
+#~ msgid "Show 1 year"
+#~ msgstr "1 ili göstər"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Yeni iclas ..."
+
+#~ msgid "New appointment for _today..."
+#~ msgstr "_Bugün üçün yeni bir iclas ..."
+
+#~ msgid "Create a new appointment for today"
+#~ msgstr "Bugün üçün yeni bir iclas yarat"
+
+#~ msgid "%s%s"
+#~ msgstr "%s%s"
+
+#~ msgid "'s calendar"
+#~ msgstr "'in təqvimi"
+
+#~ msgid "FIXME: _Delete"
+#~ msgstr "ABY : _Sil"
+
+#~ msgid "FIXME: Ca_lendar..."
+#~ msgstr "ABY : _Təqvim ..."
+
+#~ msgid "FIXME: Invite _Attendees..."
+#~ msgstr "ABY : _Ziyarətçiləri Dəvət Et .."
+
+#~ msgid "FIXME: C_ancel Invitation..."
+#~ msgstr "ABY : Dəvəti _Ləğv Et..."
+
+#~ msgid "FIXME: Save and Close"
+#~ msgstr "ABY : Qeyd Et və Qapat"
+
+#~ msgid "FIXME: Print..."
+#~ msgstr "ABY : Çap Et ..."
+
+#~ msgid "FIXME: Invite Attendees..."
+#~ msgstr "ABY : Ziyarətçiləri Dəvət Et .."
+
+#~ msgid "Invite attendees to a meeting"
+#~ msgstr "Ziyarətçiləri Dəvət Et"
+
+#~ msgid "FIXME: Delete"
+#~ msgstr "ABY : Sil"
+
+#~ msgid "Create to-do item"
+#~ msgstr "Bir \"Planlarım\" üzvü yarat"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Bir \"Planlarım\" üzvünü düzəlt"
+
+#~ msgid "Add to-do item..."
+#~ msgstr "Bir \"Planlarım\" üzvünü əlavə et ..."
+
+#~ msgid "To-do list"
+#~ msgstr "\"Planlarım\" siyahısı"
+
+#~ msgid "Edit..."
+#~ msgstr "Düzəlts..."
+
+#~ msgid "Weeks"
+#~ msgstr "Həftə"
+
+#~ msgid "Hour"
+#~ msgstr "Saat"
+
+#~ msgid "Minute"
+#~ msgstr "Dəqiqə"
+
+#~ msgid "Second"
+#~ msgstr "Saniyə"
+
+#~ msgid "TODO Items"
+#~ msgstr "\"Planlarım\" üzvləri"
+
+#~ msgid "%a"
+#~ msgstr "%a"
+
+#~ msgid "%b"
+#~ msgstr "%b"
+
+#~ msgid "Current week (%s %s %d - %s %s %d %d)"
+#~ msgstr "Hazırkı həftə ( %s %s %d - %s %s %d %d )"
+
+#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
+#~ msgstr "Hazırkı həftə ( %s %s %d %d - %s %s %d %d )"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Həftə'nın başlama günü"
+
+#~ msgid "Day range"
+#~ msgstr "Gün araları"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Gön və həftə nümayişində göstəriləcək başlama və\n"
+#~ "bitme saatlarını bildir .\n"
+#~ "Bu saatların xaricində qalan saatlar normal nümayişdə\n"
+#~ "göstərilməyəcəktir."
+
+#~ msgid "Day end:"
+#~ msgstr "Gün sonu:"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "\"Planlarım\" Siyahısındakıları Göstər :"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Daha vaxtı keçməmiş üzvləri işıqlandır"
+
+#~ msgid "To Do List"
+#~ msgstr "\"Planlarım\" Siyahısı"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Xəbərdarlıq Xüsusiyyətləri"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Ekran xəbərdarlıqlarında tınqırda"
+
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "Seçili üzvü ara yaddaşa kəs"
+
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "Seçili üzvü ara yaddaşa köçürt"
+
+#~ msgid "Select recipients' addresses"
+#~ msgstr "Göndəriləcək ünvanları bildir"
+
+#~ msgid "To: >>"
+#~ msgstr "Gn : >>"
+
+#~ msgid "Cc: >>"
+#~ msgstr "Cc : >>"
+
+#~ msgid "Bcc: >>"
+#~ msgstr "Bcc : >>"
+
+#~ msgid "label9"
+#~ msgstr "etiket9"
+
+#~ msgid "label7"
+#~ msgstr "etiket7"
+
+#~ msgid "label8"
+#~ msgstr "etiket8"
+
+#~ msgid "Discard this message?"
+#~ msgstr "Bu ismarıcı unudummu?"
+
+#~ msgid "Load a previously saved message"
+#~ msgstr "Əvvəldən qeyd edilmiş ismarıcı yüklə"
+
+#~ msgid "_Close..."
+#~ msgstr "_Qapat"
+
+#~ msgid "_Format"
+#~ msgstr "Şə_kil"
+
+#~ msgid "Check for new mail"
+#~ msgstr "Yeni ePoçt üçün bax"
+
+#~ msgid "_vFolder Editor ..."
+#~ msgstr "_vFolder Düzəldicisi ..."
+
+#~ msgid "Currently pending operations:"
+#~ msgstr "İndi gözləyən əməliyyatlar:"
+
+#~ msgid "_Create new folder..."
+#~ msgstr "_Yeni bir qovluq yarat ..."
+
+#~ msgid "Show _folder bar"
+#~ msgstr "_Qovluqlar çubuğunu göstər"
+
+#~ msgid "Help _index"
+#~ msgstr "Kömək _indeksi"
+
+#~ msgid "Field Chooser"
+#~ msgstr "Üzv Seçicisi"
+
+#~ msgid ""
+#~ "To add a column to your table, drag it into\n"
+#~ "the location in which you want it to appear."
+#~ msgstr ""
+#~ "Cədvəlinə bir sütun əlavə etmək üçün, o cədvəli\n"
+#~ "istədiyin yerə burax."
+
+#~ msgid "window1"
+#~ msgstr "pəncərə1"
+
+#~ msgid "Available fields"
+#~ msgstr "Mövcud üzvlər"
+
+#~ msgid "label2"
+#~ msgstr "etiket2"
+
+#~ msgid "Add >>"
+#~ msgstr "Əlavə Et >>"
+
+#~ msgid "<< Remove"
+#~ msgstr "<< Sil"
+
+#~ msgid "Create filter"
+#~ msgstr "Süzgəc yarat"
+
+#~ msgid "Back"
+#~ msgstr "Geri"
+
+#~ msgid "Finish"
+#~ msgstr "Bitir"
+
+#~ msgid "Apply"
+#~ msgstr "Əlavə Et"
+
+#~ msgid ""
+#~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
+#~ "continue forwards to customise it.</p>"
+#~ msgstr ""
+#~ "<h2>Süzgəclər qaydalarını qur</h2><p>Altdakı qaydalardan bir "
+#~ "dənəsini seçib, o qaydanı xüsusiləşdirməyə davam et .</p>"
+
+#~ msgid "Test these values before continuing"
+#~ msgstr "Bu qiymətləri davam etmədən əvvəl bir yoxla"
+
+#~ msgid "Select the method you would like to use to deliver your mail."
+#~ msgstr "ePoçtu göndərirken tərcih etdiyin metodu bildir."
+
+#~ msgid "Enter the hostname of the News Server you have."
+#~ msgstr "Xəbər vericisinin ünvanını ver ."
+
+#~ msgid "Cannot initialize the configuration system."
+#~ msgstr "Quraşdırma sistemini başlada bilmədim ."
+
+#~ msgid "Refile"
+#~ msgstr "Təzədən faylla"
diff --git a/po/ca.po b/po/ca.po
index f838bae090..d4a5c7f138 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,11 +4,10 @@
 #
 # Traducci� per Softcatal� <linux@softcatala.org>
 # Traductor original: V�ctor Nieto <vnie2025@alu-etsetb.upc.es>
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:05+0100\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -16,384 +15,208 @@ 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 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
+#: addressbook/backend/ebook/e-card.c:3053
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Pa�_s:"
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 #, fuzzy
 msgid ""
 "\n"
@@ -410,139 +233,38 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "P�blic"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Inhabilitat"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronitza"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copia des del Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copia al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Fusiona des del Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Fusiona cap al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 la Free Software Foundation i Helix Code"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
-"Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
-"l'Evolution\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sincronitza l'acci�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estat del conducte"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"No s'ha configurat cap Pilot, escolliu primer el\n"
-"capplet 'Pilot Link Properties'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Sense connexi� al dimoni gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"S'ha produ�t un error en intentar recollir\n"
-"la llista del Pilot del dimoni gnome-pilot"
+#: 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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -552,349 +274,436 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Afegeix"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
+msgstr "Afegeix"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Suprimeix"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "Ani_versari:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipus de tel�fon"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "F_eina"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Nou tipus de tel�fon"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Afegeix"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "C_ontactes..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nom _complet..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Detalls"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Arxiva com:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Adre�a de p�gina web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Vol rebre correu _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Feina"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "General"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Particular"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Nou tipus de tel�fon"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Fax de la feina"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "No_tes:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_M�bil"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Tipus de tel�fon"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "F_eina"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Vol rebre correu _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Aquesta �s l'adre�a de correu"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Adre�a de p�gina web:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactes..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "_Afegeix"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Adre�a..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_C�rrec:"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "_Nom de l'assistent:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "_Data de naixement:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "_Feina"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Adre�a..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "General"
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_Suprimeix"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "Nom _complet..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Particular"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_C�rrec:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "_Nom del gestor:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_M�bil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "_Sobrenom:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Professi�:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Sobrenom:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_C�njuge:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Data de naixement:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Nom de l'assistent:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "_Nom del gestor:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "_Aquesta �s l'adre�a de correu"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versari:"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tes:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detalls"
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 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
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 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
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "T�lex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 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
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Filtres d'edici�"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Nom complet:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Adre�a electr�nica 2"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Adre�a _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Canad�"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "Pa�_s:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finl�ndia"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "EUA"
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Adre�a:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_Poblaci�:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr "_Apartat de correus:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "_Comarca:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Codi postal:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprova el nom complet"
 
-#: addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
 #, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+msgid "I"
+msgstr "Si"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "�s"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Primer:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_T�tol:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_�ltim:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Mig:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_�ltim:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_T�tol:"
+
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Com a _Minicards"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Com a _taula"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -915,32 +724,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:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -949,199 +758,467 @@ msgstr "L'URI que mostrar� el navegador de carpetes"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "_Fitxer"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Contrasenya"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Error desconegut"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 #, fuzzy
 msgid "Base"
 msgstr "Enganxa"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscriu-me"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Hores"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Prioritat:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "DN arrel:"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autenticaci�:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Cam�:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "Aquest fitxer no existeix."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Nom:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripci�:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Afegeix una font"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Edita"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+msgid "Name"
+msgstr "Nom"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
+"l'Evolution\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Feu clic aqu� per a la llibreta d'adreces"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Cerca..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr "Destinataris del missatge"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "Seleccioneu un nom de la llista:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: 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:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nom"
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "<feu clic aqu� per seleccionar una data>"
+
 #: 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:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1155,131 +1232,311 @@ msgstr ""
 "\n"
 "Feu doble clic aqu� per crear un nou contacte."
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conducte de l'agenda de l'Evolution"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Cotxe"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+#: 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 "Formularis en blanc al final:"
+
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Cos"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Inferior:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Dimensions:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Lletra..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Lletres"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "Peu de p�gina:"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Format"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Cap�alera"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Cap�alera/Peu de p�gina"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Encap�alaments"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "Encap�alaments per a cada carta"
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Al�ada:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr "Un segueix immediatament l'altre"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr "Inclou:"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Horitzontal"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Esquerra:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Tabuladors de carta al costat"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Marges"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "Nombre de columnes:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Opcions"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Orientaci�"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "P�gina"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr "Configuraci� de la p�gina:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Paper"
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Font del paper:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Vertical"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Previsualitzaci�:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Imprimeix usant ombrejat de grisos"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Inverteix-ho per a les p�gines senars"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Dreta:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Seccions:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Ombrejat"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr "Mida:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Comen�a en una nova p�gina"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Nom de l'estil:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Superior:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Tipus:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Amplada:"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-"Utilitat de configuraci� per al conducte de les coses per fer de "
-"l'Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� de coses per fer del Pilot"
 
-#: calendar/gui/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
-msgid "Snooze"
-msgstr "'Snooze'"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "D'acord"
-
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 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: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"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: 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: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:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Alta"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Baixa"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "No iniciat"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "En proc�s"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+#, fuzzy
+msgid "Completed"
+msgstr "% comp_let:"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "Cancel�lat"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1290,36 +1547,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: 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"
-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: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: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: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:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1329,57 +1574,122 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1013
 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: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-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+#, fuzzy
+msgid "Recurring"
+msgstr "Recurr�ncia"
+
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Assigna una puntuaci�"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "Ara"
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-summary.c:196
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 #, fuzzy
 msgid "%I:%M%p"
 msgstr "%I:%M %p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 #, fuzzy
 msgid "Display"
 msgstr "_Visualitzaci�"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "Mostra les _adjuncions"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrar� l'agenda"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Recordatori de la vostra cita a "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "'Snooze'"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "D'acord"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
 #: 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"
@@ -1392,241 +1702,851 @@ msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "Tanca"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Edita una cita"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Durada de l'snooze (minuts)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 minuts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 minuts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 hores (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 minuts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 hores"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 minuts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 minuts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr "Les alarmes es desactiven despr�s de"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr "Alarmes ac�stiques"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr "Fes un so quan aparegui una finestra d'alarma."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Prefer�ncies de l'agenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Colors"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr "Comprimeix els caps de setmana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr "Opcions del navegador de dates"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr "Valors predeterminats"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr "Opcions de visualitzaci�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr "Data de venciment"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr "Habilita l'snoozing per a"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr "Final del dia:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr "primer dia de la setmana:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "dv."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "Divendres"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr "Ressalta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr "Elemts que vencen avui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr "Elements que vencen avui:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr "Elements que encara no han ven�ut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr "Elements que encara no han ven�ut:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "dl."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Dilluns"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr "Elements ven�uts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr "Elements que ja han ven�ut:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr "Agafa un color"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Prioritat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Remind me of all appointments"
+msgstr "Recorda'm totes les cites"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+msgid "Reminders"
+msgstr "Recordatoris"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "ds."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr "Mostra"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "Mostra els n�meros de les setmanes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr "Inici del dia:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "dg."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "TaskPad"
+msgstr "TaskPad"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "dj."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Dijous"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr "Temps fins al venciment"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr "Divisions de temps:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr "Format de l'hora:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "dm."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr "Alarmes visuals"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "dc."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr "Setmana de treball"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr "minuts abans que es produeixin."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "segons."
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, 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:66
+#: calendar/gui/dialogs/delete-comp.c:71
 #, 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:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, 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:75
+#: calendar/gui/dialogs/delete-comp.c:80
 #, 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:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, 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:84
+#: calendar/gui/dialogs/delete-comp.c:89
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% comp_let:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Classificaci�"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data d'enviament"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr "Data completa:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Pri_vat"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "En proc�s"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "P�_blic"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Data d'ini_ci:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "Resu_m:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Tasca"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_Contactes..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr "_Data de venciment:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Prioritat:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_Estat:"
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: 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:154
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Classificaci�"
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completat"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 #, 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
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent 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
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparent"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "_Obre..."
+#: calendar/gui/e-calendar-table.c:169
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Obre la tasca"
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: 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:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "Edita aquest element..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Edita la tasca"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Suprimeix la tasca"
+
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: 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..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nova cita..."
 
-#: 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:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "Seleccioneu una carpeta"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:153
+#, fuzzy
+msgid "I couldn't update your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+#, fuzzy
+msgid "I couldn't read your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+#, fuzzy
+msgid "I couldn't update your calendar store."
+msgstr "No s'ha pogut crear una agenda a `%s'"
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Sobre l'agenda"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "set"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentatiu"
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "_Obre una agenda"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A, %d de %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Data de venciment"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Imprimeix l'agenda"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organitzaci�:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+msgid "Sender"
+msgstr "Remitent"
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resum:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+#, fuzzy
+msgid "date-start"
+msgstr "Inici del dia:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+#, fuzzy
+msgid "Attendee"
+msgstr "Tots els assistents"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Tots els assistents"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+#, fuzzy
+msgid "Attendees: "
+msgstr "Tots els assistents"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Cotxe"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "Hora d'_inici de la reuni�:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Organitzaci�:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+#, fuzzy
+msgid "Required Participant"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "M�bil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 #, fuzzy
 msgid "Category:"
 msgstr "categories"
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
@@ -1638,305 +2558,581 @@ msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Edita una cita"
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr "el"
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
+msgstr "Cites:"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Dilluns"
+#: calendar/gui/event-editor-dialog.glade.h:4
+msgid "Appointment Basics"
+msgstr "Temes fonamentals sobre les cites"
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Dimarts"
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
+msgstr "Recurr�ncia personalitzada"
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Dimecres"
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Dijous"
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Excepcions"
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Divendres"
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
+msgstr "Modifica"
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Dissabte"
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr "Sense recurr�ncia"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Diumenge"
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+#, fuzzy
+msgid "Preview"
+msgstr "Previsualitzaci�:"
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr "Recurr�ncia"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
+msgstr "Regla de recurr�ncia"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+msgid "Reminder"
+msgstr "Recordatori"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executa el programa:"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "S'est� recollint el correu des de %s"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "_Par�metres"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "Mostra 1 dia"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr "Recurr�ncia simple"
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _finalitzaci�:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr "Hora d'_inici:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr "Data d'_inici:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "despr�s de"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "abans de"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "dia(es)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "Recorda'm totes les cites"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr "per a"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr "per sempre"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "hores"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuts"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "mes(os)"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "Edita una cita"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr "fins a"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr "setmana(es)"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "any(s)"
+
+#: calendar/gui/event-editor.c:371
+msgid "Edit Appointment"
+msgstr "Edita una cita"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr "el"
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dia"
+
+#: calendar/gui/event-editor.c:601
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "dies"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "Mostra 1 dia"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "setmanes"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "Mostra 1 setmana"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "hores"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "hora"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "minuts"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "10 minuts"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr " segons"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr " segons"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Recorda'm totes les cites"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, 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:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, 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:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/gnome-cal.c:695
 #, 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:707
+#: calendar/gui/gnome-cal.c:706
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#. 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:1
+#, fuzzy
+msgid "April"
+msgstr "abril"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "dl."
+#: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
+msgid "August"
+msgstr "agost"
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "dm."
+#: calendar/gui/goto-dialog.glade.h:3
+#, fuzzy
+msgid "December"
+msgstr "desembre"
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "dc."
+#: calendar/gui/goto-dialog.glade.h:4
+#, fuzzy
+msgid "February"
+msgstr "febrer"
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "dj."
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "V�s a una data"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "dv."
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "V�s a avui"
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "ds."
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "January"
+msgstr "gener"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "July"
+msgstr "juliol"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "June"
+msgstr "juny"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "March"
+msgstr "mar�"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "May"
+msgstr "Dilluns"
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "November"
+msgstr "novembre"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "October"
+msgstr "octubre"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "September"
+msgstr "setembre"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
@@ -1945,11 +3141,85 @@ msgstr "Previsualitzaci� d'impressi�"
 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
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -2028,80 +3298,217 @@ msgstr "El programa Movemail ha fallat: %s"
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No s'ha pogut carregar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 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:184
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 #, 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
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "El servidor ha rebutjat el nom d'usuari"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autenticaci�:"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Error en carregar la informaci� del filtre:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Error en carregar la informaci� del filtre:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
+"autenticar-vos-hi."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
+"text net."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
+"autenticar-vos-hi."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
+"text net."
+
+#: camel/camel-search-private.c:105
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Error en escriure a la b�stia de correu temporal: %s"
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, 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:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "Prove�dor de correu de la carpeta virtual"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
+
+#: camel/camel-session.c:322
 #, 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:390
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2110,32 +3517,32 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Tasca"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La cadena d'URL `%s' no cont� cap protocol"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La cadena d'URL `%s' cont� un protocol incorrecte"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "El n�mero de port de l'URL `%s' no �s num�ric"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta inesperada del servidor IMAP: %s"
+msgid "No such message: %s"
+msgstr "L'ordinador central %s no existeix."
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -2147,7 +3554,7 @@ msgstr "Resposta inesperada del servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -2166,13 +3573,18 @@ msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -2184,30 +3596,46 @@ 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:251
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
+"No es pot connectar al servidor POP.\n"
+"No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/imap/camel-imap-store.c:262
-#, fuzzy
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
-"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
-"autenticar-vos-hi."
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2218,7 +3646,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
@@ -2250,51 +3678,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
-#, fuzzy
-msgid "Local folders may not be nested."
-msgstr "Les carpetes Mbox no es poden imbricar."
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -2333,8 +3752,8 @@ msgstr "L'ordinador central %s no existeix."
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -2343,15 +3762,15 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -2360,19 +3779,19 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
@@ -2406,7 +3825,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2415,7 +3834,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2424,14 +3843,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2440,74 +3859,87 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no �s buida. No s'ha suprimit."
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "S'est� sincronitzant \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "S'est� sincronitzant \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongru�ncia del resum, s'est� interrompent la sincronitzaci�"
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
@@ -2518,7 +3950,7 @@ msgstr "Error desconegut: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
@@ -2592,16 +4024,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "S'estan recuperant els missatges : %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "S'estan recuperant els missatges : %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
@@ -2619,7 +4061,22 @@ msgstr ""
 "recuperar correu des de determinats prove�dors de correu web i sistemes "
 "propietaris de correu."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Per connectar als servidors POP. El protocol POP tamb� es pot utilitzar per "
+"recuperar correu des de determinats prove�dors de correu web i sistemes "
+"propietaris de correu."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -2627,7 +4084,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:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -2637,29 +4094,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:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 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:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, 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:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, 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:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2668,12 +4125,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:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -2681,7 +4138,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:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2690,12 +4147,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -2738,32 +4196,167 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 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.glade.h:55
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
 #, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
+"correu utilitzant SMTP."
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Mou el missatge"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Amaga"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "No s'ha indicat cap contrasenya."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"No es pot connectar al servidor POP.\n"
+"No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Autenticaci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autenticaci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -2772,121 +4365,111 @@ 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:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
-"autenticar-vos-hi."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, 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:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, 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:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, 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:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Prove�dor de correu de la carpeta virtual"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 octet"
@@ -2912,19 +4495,15 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "adjunci�"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Elimina"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
@@ -2937,40 +4516,81 @@ msgstr "Afegeix una adjunci�..."
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: 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-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "adjunci�"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Propietats de l'adjunci�"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Nom del fitxer:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "adjunci�"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "Tipus de MIME:"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "Envia \"%s\""
+
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: 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"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 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:328
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2978,15 +4598,7 @@ 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:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introdu�u l'assumpte del correu"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -2995,38 +4607,26 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "S'estan desant els canvis al missatge..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Desa els canvis al missatge..."
-
-#: 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:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3036,27 +4636,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no �s habitual."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Aquest fitxer existeix per� no es pot llegir."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 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:961
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3064,23 +4664,263 @@ msgstr ""
 "El fitxer �s molt gran (m�s de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "S'ha produ�t un error en llegir el fitxer."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Barra de _dreceres de l'Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Adre�a"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Cap informaci�"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: 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."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, 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:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Tanca"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mou a la carpeta"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "V�s a l'element anterior"
+
+#: executive-summary/component/e-summary-url.c:79
+#, 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:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configura la carpeta"
+
+#: executive-summary/component/e-summary.c:918
+#, 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:932
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "R_esum"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update every "
+msgstr "_Actualitza lliure/ocupat"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minuts"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "any"
@@ -3121,10 +4961,6 @@ msgstr "hores"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuts"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "segon"
@@ -3195,39 +5031,20 @@ msgstr "ara"
 msgid "<click here to select a date>"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Afegeix una regla de filtre"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Edita una regla de filtre"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-#, fuzzy
-msgid "outgoing"
-msgstr "Agrupament"
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Filtres d'edici�"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Elimina una acci�"
 
@@ -3237,7 +5054,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -3249,7 +5066,7 @@ msgstr "Introdu�u l'URI de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3258,421 +5075,537 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Elimina un criteri"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filtres d'edici�"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Edita les VFolders"
+
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid "Outgoing"
+msgstr "Contorn:"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+msgid "Virtual Folders"
+msgstr "Carpetes virtuals"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "No s'ha trobat la carpeta indicada"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Fonts de la vFolder"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Crea una carpeta nova"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigna una puntuaci�"
 
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copia a la carpeta"
-
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recepci�"
+#, fuzzy
+msgid "Attachments"
+msgstr "adjunci�"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data d'enviament"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "cont�"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expressi�"
+msgid "Copy to Folder"
+msgstr "Copia a la carpeta"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adre�a"
+msgid "Date received"
+msgstr "Data de recepci�"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Cos del missatge"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Cos del missatge"
+msgid "Date sent"
+msgstr "Data d'enviament"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "S'ha rebut el missatge"
+msgid "does not contain"
+msgstr "no cont�"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "S'ha enviat el missatge"
+msgid "does not end with"
+msgstr "no acaba amb "
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mou a la carpeta"
+msgid "does not exist"
+msgstr "no existeix"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinataris"
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+msgid "does not start with"
+msgstr "no comen�a per"
 
-#: 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:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "no existeix"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remitent"
+msgid "ends with"
+msgstr "acaba amb"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "Estat de la connexi�"
+msgid "Exist"
+msgstr "S_urt"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Font"
+msgid "exists"
+msgstr "existeix"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Especifiqueu la cap�alera"
+msgid "Expression"
+msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "Reenvia-ho a l'adre�a"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Atura el processament"
+msgid "is"
+msgstr "�s"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assumpte"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "�s m�s gran que"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "despr�s de"
+msgid "is less than"
+msgstr "�s m�s petit que"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "abans de"
+msgid "is not"
+msgstr "no �s"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "cont�"
+#, fuzzy
+msgid "Mailing list"
+msgstr "Llista de correu %s"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "no cont�"
+msgid "Message Body"
+msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "no acaba amb "
+#, fuzzy
+msgid "Message Header"
+msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "no existeix"
+msgid "Message was received"
+msgstr "S'ha rebut el missatge"
 
 #: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
+msgid "Message was sent"
+msgstr "S'ha enviat el missatge"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "no comen�a per"
+msgid "Move to Folder"
+msgstr "Mou a la carpeta"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "acaba amb"
+msgid "on or after"
+msgstr "el o despr�s del"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existeix"
+msgid "on or before"
+msgstr "el o abans del"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "�s m�s gran que"
+msgid "Recipients"
+msgstr "Destinataris"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "�s m�s petit que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "no �s"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "�s"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Puntuaci�"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "el o despr�s del"
+#, fuzzy
+msgid "Set Status"
+msgstr "Estat de la connexi�"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "el o abans del"
-
-#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
+msgstr "Font"
+
 #: filter/libfilter-i18n.h:42
+msgid "Specific header"
+msgstr "Especifiqueu la cap�alera"
+
+#: filter/libfilter-i18n.h:43
 msgid "starts with"
 msgstr "comen�a per"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr "Atura el processament"
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Assumpte"
+
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "ha estat despr�s de"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "ha estat abans de"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Afegeix una regla"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Afegeix una regla de la VFolder"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Edita una regla de la VFolder"
-
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propietats..."
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+#, fuzzy
+msgid "Properties"
+msgstr "Propietats..."
+
+#: mail/folder-browser.c:219
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "El cos o l'assumpte contenen"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "El cos cont�"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "L'assumpte cont�"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "El cos no cont�"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "L'assumpte no cont�"
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Obre"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Edita"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimeix"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "V�s endavant en el temps"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 #, 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%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 "Cap"
+#: mail/folder-browser.c:705
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/mail-accounts.c:115
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "No s'ha pogut iniciar el wombat"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Format"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipus de font de not�cies:"
+
+#: 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
+#, fuzzy
+msgid "maildir"
+msgstr "Adre�a electr�nica 2"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 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
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Especifiqueu la cap�alera"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3688,12 +5621,16 @@ msgstr "Assumpte"
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Afegeix una regla de filtre"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3705,7 +5642,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3713,7 +5650,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3721,15 +5658,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "No teniu configurada cap b�stia de sortida"
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3737,31 +5670,36 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 #, 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
+#: mail/mail-callbacks.c:316
 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:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3769,11 +5707,11 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3781,17 +5719,17 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1088
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3800,22 +5738,318 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "cont�"
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid "Account Information"
+msgstr "Cap informaci�"
+
+#: mail/mail-config.glade.h:3
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Afegeix..."
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Authentication"
+msgstr "Autenticaci�:"
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autenticaci�:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Par�metres de prova"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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 ""
+"Ja teniu enllestida la configuraci� del correu.\n"
+"Feu clic a \"Finalitza\" per desar els nous par�metres"
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Valors predeterminats"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "Cap"
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Email Address:"
+msgstr "Adre�a electr�nica:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "Adre�a electr�nica:"
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Configuraci� del correu"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nom complet:"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nom d'usuari:"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Identitat"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "No suprimeixis els missatges del servidor"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "Mail"
+msgstr "_Correu"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Mail Account"
+msgstr "cont�"
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr "Configuraci� del correu"
+
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Configuraci� del correu"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "Marca el missatge com a vist [ms]: "
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "News"
+msgstr "Nou"
+
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Optional"
+msgstr "Opcions"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Organitzaci�:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasenya"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Adre�a electr�nica:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Required"
+msgstr "Persones _requerides"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Save password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "Envia els missatges en format HTML"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Configuraci� del correu"
+
+#: mail/mail-config.glade.h:63
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Fonts"
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Transparent"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Autenticaci�:"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipus:"
+
+#: mail/mail-config.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.glade.h:75
+#, fuzzy
+msgid "User Information"
+msgstr "Cap informaci�"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Edita"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "minuts"
+
+#: mail/mail-config-druid.c:421
 #, 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
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "Nom:"
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3823,144 +6057,144 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "No s'han pogut escriure les dades: %s"
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:626
+#: mail/mail-format.c:704
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
+msgid "Loading message content"
+msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "La carpeta `%s' no existeix."
+
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Obre a %s..."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Canvia la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "S'est� tancant la carpeta actual"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "S'est� canviant el nom de la carpeta antiga i obrint-la"
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "C�pia de missatges"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -3969,7 +6203,7 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -3977,24 +6211,7 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "Creaci� d'una nova carpeta"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Crea una carpeta nova"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -4003,7 +6220,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -4012,478 +6229,524 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
 
-#: 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:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Recull el correu des de %s"
-
-#: 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:430
-msgid "Filtering email on demand"
-msgstr "S'est� filtrant el correu sota demanda"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr "Filtra el correu sota demanda"
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr "S'est� enviant la cua"
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr "Envia la cua"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr "S'est� afegint \"%s\""
-
-#: 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: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: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:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: 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:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Mou el(s) missatge(s) cap a"
 
-#: 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:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "S'est� copiant"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Sense descripci�)"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "S'est� sincronitzant \"%s\""
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, 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:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "S'est� carregant la carpeta %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Carrega la carpeta %s"
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, 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:1935
+#: mail/mail-ops.c:1672
 #, 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:1949
+#: mail/mail-ops.c:1686
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-search-dialogue.c:104
+#: mail/mail-ops.c:1760
 #, fuzzy
-msgid "Cancel"
-msgstr "Cancel�lat"
-
-#: 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!"
+msgid "Saving attachment"
+msgstr "Desa l'adjunci�"
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:1775
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1803
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Error en `%s':\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "S'ha produ�t un error en llegir les ordres de la cadena cursada."
+msgid "Could not write data: %s"
+msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Missatge malm�s de la cadena cursada?"
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Cerca"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "No s'ha pogut crear el quadre de di�leg."
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "Cancel�lat"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "Consulta cancel�lada per l'usuari."
+#: mail/mail-send-recv.c:231
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Sendmail"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
+#: mail/mail-send-recv.c:234
+#, fuzzy
+msgid "Receiving"
+msgstr "Data de recepci�"
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "S'est� examinant %s"
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
+msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
-"No s'ha pogut llegir el fitxer de la mem�ria cau UID \"%s\". �s possible que "
-"rebeu missatges duplicats."
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "S'est� recuperant el missatge %d de %d"
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "S'est� enviant \"%s\""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "S'est� escrivint el missatge %d de %d"
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancel�lat"
+
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "% comp_let:"
 
-#: mail/mail-tools.c:347
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
+msgstr "S'ha escrit un missatge incomplet al conducte!"
+
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
-msgstr "S'estan desant els canvis a %s"
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (missatge reenviat)"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"No es pot obrir la ubicaci� `%s':\n"
-"%s"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "No s'ha pogut enviar el missatge: %s"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Mou el missatge"
+
+#: mail/message-list.c:952
 #, 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:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 #, fuzzy
 msgid "<unknown>"
 msgstr "Desconegut"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "adjunci�"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepci�"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 msgid "To"
 msgstr "Per a"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 msgid "Size"
 msgstr "Mida"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, 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
+#: mail/openpgp-utils.c:92
 #, 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
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 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
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 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
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, 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
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Puntuaci�"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 #, fuzzy
 msgid "Display folders starting with:"
 msgstr "Visualitza les carpetes que continguin:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:280
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:282
 #, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:297
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom del fitxer:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Carpetes"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "No hi ha espai suficient per crear la carpeta"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:309
 #, fuzzy, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Escaneja les carpetes de \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "No hi ha nou correu a %s."
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "S'est� movent"
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:327
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/importer/importer.c:342
 #, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+msgid "Error loading %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+#, fuzzy
+msgid "Automatic"
+msgstr "Tria autom�tica"
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "Nom del fitxer:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Fitxer de signatura:"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "Nom del fitxer:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -4512,7 +6775,8 @@ msgid "Evolution files successfully installed."
 msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembla que aquesta �s la primera vegada que executeu l'Evolution."
 
 #: shell/e-setup.c:190
@@ -4563,7 +6827,7 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal�laci� dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4572,11 +6836,11 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "El nom de carpeta indicat no �s v�lid."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
@@ -4588,7 +6852,7 @@ msgstr ""
 "El tipus de la carpeta seleccionada no �s v�lid per a\n"
 "l'operaci� sol�licitada."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nou..."
 
@@ -4596,20 +6860,20 @@ msgstr "Nou..."
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 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:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4619,24 +6883,24 @@ msgstr ""
 "per a correu, agenda i gesti� de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Carpetes"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
@@ -4646,7 +6910,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1242
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4730,87 +6994,92 @@ msgstr "Activa aquesta drecera"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Visualitza"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
+msgid "The Evolution shell."
+msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
+
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hola! Gr�cies per prendre-us la mol�stia de baixar-vos aquesta versi�\n"
 "provisional del conjunt de programes de grup de treball Evolution.\n"
@@ -4834,7 +7103,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4842,1248 +7111,2091 @@ msgstr ""
 "Gr�cies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:178
+#: shell/main.c:175
 #, fuzzy
 msgid "Disable."
 msgstr "Inhabilitat"
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Cita"
+#: ui/evolution-addressbook.xml.h:2
+#, fuzzy
+msgid "Create new contact"
+msgstr "Crea un nou contacte"
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Pe_tici� de cita"
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
+msgstr "Suprimeix un contacte"
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Missatge de _correu"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Cerca"
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacte"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
+msgstr "Cerca un contacte"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tasca"
+#: ui/evolution-addressbook.xml.h:7
+#, fuzzy
+msgid "New contact"
+msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _Petici� de tasca"
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada al _diari"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
+msgstr "Imprimeix els contactes"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+msgid "Stop"
+msgstr "Atura"
 
-#: 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:13
+msgid "Stop Loading"
+msgstr "Atura la c�rrega"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estil _memo"
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
+msgstr "Visualitza'ls tots"
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
+msgstr "Visualitza tots els contactes"
+
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Defineix els e_stils d'impressi�..."
+msgid "_Addressbook Sources..."
+msgstr "Afegeix una font"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: E_nvia"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Contactes..."
 
-#: ui/evolution-contact-editor.xml:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Invita els assistents..."
+msgid "_Print..."
+msgstr "Imprimeix..."
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr "_Cerca contactes"
+
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Eines"
 
-#: ui/evolution-contact-editor.xml:38
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 dies"
+
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
+msgstr "Modifica les prefer�ncies"
+
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
+
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
+msgstr "Crea una nova agenda"
+
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "_Mou a la carpeta"
+msgid "Go To"
+msgstr "V�s a"
+
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
+msgstr "V�s enrera en el temps"
 
-#: ui/evolution-contact-editor.xml:39
+#: ui/evolution-calendar.xml.h:9
+msgid "Go forward in time"
+msgstr "V�s endavant en el temps"
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
+msgstr "V�s a una data concreta"
+
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to present time"
+msgstr "V�s al present"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Tr_ia el formulari..."
+msgid "New Appointment"
+msgstr "Nova cita..."
 
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Con_figuraci� de la p�gina"
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Seg�ent"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualitzaci� de la impressi�"
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "Open Calendar"
+msgstr "_Obre una agenda"
+
+#: ui/evolution-calendar.xml.h:17
+msgid "Prev"
+msgstr "Anterior"
 
-#: ui/evolution-contact-editor.xml:63
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Enganxa e_special..."
+msgid "Print calendar"
+msgstr "Imprimeix l'agenda"
 
-#: ui/evolution-contact-editor.xml:68
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Marca'l com a per _llegir"
+msgid "Print this Calendar"
+msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objecte"
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Save As"
+msgstr "_Anomena i desa"
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Element"
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Save calendar as something else"
+msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: 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:26
+msgid "Show 1 day"
+msgstr "Mostra 1 dia"
 
-#: 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:27
+msgid "Show 1 month"
+msgstr "Mostra 1 mes"
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _�ltim element de la carpeta"
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Mostra 1 setmana"
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: E_st�ndard"
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: S'est� __formatant"
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Avui"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalitza..."
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Setmana"
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "Ant_erior"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cites:"
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr "Se_g�ent"
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Nou"
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Barres d'eines"
+#: ui/evolution-calendar.xml.h:34
+msgid "_Open Calendar"
+msgstr "_Obre una agenda"
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _Fitxer..."
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "Anomena i desa..."
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: El_ement..."
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Suprimeix aquest element"
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objecte..."
+#: ui/evolution-contact-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Suprimeix"
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Lletra..."
+#: ui/evolution-contact-editor.xml.h:4
+#, fuzzy
+msgid "Help"
+msgstr "_Ajuda"
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Par�graf..."
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Diss_enya aquest formulari"
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr "Imprimeix aquest element"
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: D_issenya un formulari..."
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr "Imprimeix..."
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publica el _formulari..."
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+#, fuzzy
+msgid "Save _As..."
+msgstr "Anomena i desa..."
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blica el formulari com a..."
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr "Desa i tanca"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de seq��ncies"
+#: ui/evolution-contact-editor.xml.h:10
+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:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Formularis"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Consulta l'ajuda en l�nia"
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "FIXME: Contacte _nou"
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "FIXME: Nou _missatge per contactar"
 
-#: 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:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Fitxer"
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Nova _carta per contactar"
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr "_Desa"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Nova _carta per contactar"
+msgid "About this application"
+msgstr "Autenticaci�:"
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Nova cit_a amb contacte"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+#, fuzzy
+msgid "About..."
+msgstr "Lletra..."
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Prepara una cita..."
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+#, fuzzy
+msgid "Actio_ns"
+msgstr "_Accions"
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: Nova _tasca per contactar"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#, fuzzy
+msgid "Address _Book... (FIXME)"
+msgstr "FIXME: _Llibreta d'adreces..."
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Nova entrada al _diari per contactar"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#, fuzzy
+msgid "C_lear"
+msgstr "Agenda"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _Assenyala per al seguiment..."
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+#, fuzzy
+msgid "C_ut"
+msgstr "Personalitzat"
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: _Mostra el mapa de l'adre�a"
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#, fuzzy
+msgid "Chec_k Names (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: _Obre la p�gina web"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#, fuzzy
+msgid "Clear"
+msgstr "Agenda"
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Reenvia com a _vCard"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#, fuzzy
+msgid "Clear the selection"
+msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: Reen_via"
+#: ui/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-contact-editor.xml:169
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 #, fuzzy
-msgid "_Insert"
-msgstr "_�ndex"
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Copia a la carpeta"
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormat"
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Copia"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Eines"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+#, fuzzy
+msgid "Copy the selection"
+msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-contact-editor.xml:172
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 #, fuzzy
-msgid "Actio_ns"
-msgstr "_Accions"
+msgid "Cut"
+msgstr "Personalitzat"
 
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr "FIXME: Anterior"
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+#, fuzzy
+msgid "Cut the selection"
+msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "V�s a l'element anterior"
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
-msgstr "FIXME: Seg�ent"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:250
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#, fuzzy
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "FIXME: Pr_imer element de la carpeta"
+
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#, fuzzy
+msgid "For_ward (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: ui/evolution-event-editor.xml.h:23
+#, fuzzy
+msgid "Forward as v_Calendar (FIXME)"
+msgstr "FIXME: Reenvia com a v_Calendar"
+
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 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"
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "V�s a l'element anterior"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentatiu"
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#, fuzzy
+msgid "In_complete Task (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupat"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+#, fuzzy
+msgid "Modify the file's properties"
+msgstr "Propietats de la llista de coses per fer"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora de l'oficina"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+#, fuzzy
+msgid "N_ext"
+msgstr "Seg�ent"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Cap informaci�"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "Enganxa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_Invita a altres..."
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcions"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "Ant_erior"
 
-#: 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:33 ui/evolution-task-editor-dialog.xml.h:36
+#, fuzzy
+msgid "Previous"
+msgstr "Ant_erior"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Mostra-ho reduint el zoom"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Previsualitzaci� d'impressi�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Actualitza lliure/ocupat"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Imprimeix..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#, fuzzy
+msgid "Print Setup"
+msgstr "Configuraci� de la p�gina:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "Tria autom�tica"
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Desa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de di�leg"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Totes les persones i recursos"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+#, fuzzy
+msgid "Save the current file"
+msgstr "l'hora actual"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Totes les persones i un recurs"
+#: ui/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "Seleccioneu una carpeta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persones _requerides"
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persones requerides i _un recurs"
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#, fuzzy
+msgid "Select All"
+msgstr "Selecciona'ls _tots"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora d'_inici de la reuni�:"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#, fuzzy
+msgid "Select everything"
+msgstr "Seleccioneu una carpeta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _finalitzaci� de la reuni�:"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Tots els assistents"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#. 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"
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+#, fuzzy
+msgid "_About..."
+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"
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+msgid "_Contact (FIXME)"
+msgstr "_Contacte (FIXME)"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Ara"
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#, fuzzy
+msgid "_Copy"
+msgstr "Copia"
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Avui"
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+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:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+msgid "_Help"
+msgstr "_Ajuda"
 
-#. 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:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#: widgets/misc/e-search-bar.c:176
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Cerca"
+msgid "_Journal Entry (FIXME)"
+msgstr "_Contacte (FIXME)"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grup %i"
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "FIXME: _�ltim element de la carpeta"
 
-#~ msgid "Delete Contact?"
-#~ msgstr "Voleu suprimir el contacte?"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "Missatge de _correu (FIXME)"
 
-#~ msgid "Address _2:"
-#~ msgstr "Adre�a _2:"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "_Mou a la carpeta"
 
-#~ msgid "Canada"
-#~ msgstr "Canad�"
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_Contacte (FIXME)"
 
-#~ msgid "Check Address"
-#~ msgstr "Comprova l'adre�a"
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#, fuzzy
+msgid "_Paste"
+msgstr "Enganxa"
 
-#~ msgid "Countr_y:"
-#~ msgstr "Pa�_s:"
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Imprimeix"
 
-#~ msgid "Finland"
-#~ msgstr "Finl�ndia"
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propietats..."
 
-#~ msgid "USA"
-#~ msgstr "EUA"
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "Selecciona'ls _tots"
 
-#~ msgid "_Address:"
-#~ msgstr "_Adre�a:"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#~ msgid "_City:"
-#~ msgstr "_Poblaci�:"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_Contacte (FIXME)"
 
-#~ msgid "_PO Box:"
-#~ msgstr "_Apartat de correus:"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "Afegeix una font"
 
-#~ msgid "_State/Province:"
-#~ msgstr "_Comarca:"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Codi postal:"
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "Crea un nou contacte"
+
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
+#: ui/evolution-executive-summary.xml.h:5
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Afegeix una font"
+msgid "New Mail"
+msgstr "Recupera el correu"
 
-#~ msgid "Find..."
-#~ msgstr "Cerca..."
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
+msgstr "Redacta"
 
-#~ msgid "Message Recipients"
-#~ msgstr "Destinataris del missatge"
+#: ui/evolution-mail.xml.h:3
+msgid "Compose a new message"
+msgstr "Redacta un nou missatge"
 
-#~ msgid "Select Names"
-#~ msgstr "Seleccioneu els noms"
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
+msgstr "Copia el missatge a una nova carpeta"
 
+#: ui/evolution-mail.xml.h:6
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Seleccioneu un nom de la llista:"
+msgid "Create _Virtual Folder From Message"
+msgstr "Carpetes virtuals"
 
-#~ msgid "123"
-#~ msgstr "123"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
-#~ msgid "a"
-#~ msgstr "a"
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Dies buits:"
 
-#~ msgid "b"
-#~ msgstr "b"
+#: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filtre sobre el remitent"
 
-#~ msgid "c"
-#~ msgstr "c"
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filtre sobre els destinataris"
 
-#~ msgid "d"
-#~ msgstr "d"
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filtre sobre l'assumpte"
 
-#~ msgid "e"
-#~ msgstr "e"
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
+msgstr "Oblida les _contrasenyes"
 
-#~ msgid "f"
-#~ msgstr "f"
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Forward As"
+msgstr "Reenvia"
 
-#~ msgid "g"
-#~ msgstr "g"
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "Cerca completa"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#~ msgid "i"
-#~ msgstr "i"
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Suprimeix el missatge"
 
-#~ msgid "j"
-#~ msgstr "j"
+#: ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Missatge reenviat - %s"
 
-#~ msgid "k"
-#~ msgstr "k"
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Inline"
+msgstr "Visualitza en l�nia"
 
-#~ msgid "l"
-#~ msgstr "l"
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Gestiona les subscripcions..."
 
-#~ msgid "m"
-#~ msgstr "m"
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Mar_ca'l com a llegit"
 
-#~ msgid "n"
-#~ msgstr "n"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Mar_ca'l com a llegit"
 
-#~ msgid "o"
-#~ msgstr "o"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Marca'l com a per _llegir"
 
-#~ msgid "p"
-#~ msgstr "p"
+#: ui/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Message _Display"
+msgstr "Esborra la visualitzaci� del missatge"
 
-#~ msgid "q"
-#~ msgstr "q"
+#: ui/evolution-mail.xml.h:28
+msgid "Move"
+msgstr "Mou"
 
-#~ msgid "r"
-#~ msgstr "r"
+#: ui/evolution-mail.xml.h:29
+msgid "Move message to a new folder"
+msgstr "Mou un missatge a una nova carpeta"
 
-#~ msgid "s"
-#~ msgstr "s"
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr "Imprimeix el missatge a la impressora"
+
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Cap"
 
-#~ msgid "t"
-#~ msgstr "t"
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
 
-#~ msgid "u"
-#~ msgstr "u"
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Respon a _tots"
 
-#~ msgid "v"
-#~ msgstr "v"
+#: ui/evolution-mail.xml.h:43
+#, fuzzy
+msgid "S_ource"
+msgstr "Font"
 
-#~ msgid "w"
-#~ msgstr "w"
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "Selecciona'ls _tots"
 
-#~ msgid "x"
-#~ msgstr "x"
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Selecciona'ls _tots"
 
-#~ msgid "y"
-#~ msgstr "y"
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "z"
-#~ msgstr "z"
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Mostra"
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
+#: ui/evolution-mail.xml.h:50
+msgid "Threaded Message list"
+msgstr "Llista de missatges en cadena"
 
-#~ msgid "Blank forms at end:"
-#~ msgstr "Formularis en blanc al final:"
+#: ui/evolution-mail.xml.h:51
+msgid "VFolder on Se_nder"
+msgstr "VFolder sobre el remite_nt"
 
-#~ msgid "Body"
-#~ msgstr "Cos"
+#: ui/evolution-mail.xml.h:52
+msgid "VFolder on _Recipients"
+msgstr "VFolder sobre els destinata_ris"
 
-#~ msgid "Bottom:"
-#~ msgstr "Inferior:"
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "VFolder sobre l'assumpte"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensions:"
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
-#~ msgid "Font..."
-#~ msgstr "Lletra..."
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Editor de carpetes _virtuals..."
 
-#~ msgid "Fonts"
-#~ msgstr "Lletres"
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Accions"
 
-#~ msgid "Footer:"
-#~ msgstr "Peu de p�gina:"
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr "_Aplica els filtres"
 
-#~ msgid "Format"
-#~ msgstr "Format"
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Redacta"
 
-#~ msgid "Header"
-#~ msgstr "Cap�alera"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta"
 
-#~ msgid "Header/Footer"
-#~ msgstr "Cap�alera/Peu de p�gina"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
 
-#~ msgid "Headings"
-#~ msgstr "Encap�alaments"
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr "_Esborra"
 
-#~ msgid "Headings for each letter"
-#~ msgstr "Encap�alaments per a cada carta"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtres de correu ..."
 
-#~ msgid "Height:"
-#~ msgstr "Al�ada:"
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Carpeta"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "Un segueix immediatament l'altre"
+#: ui/evolution-mail.xml.h:65
+msgid "_Forward"
+msgstr "_Reenvia"
 
-#~ msgid "Include:"
-#~ msgstr "Inclou:"
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverteix la selecci�"
 
-#~ msgid "Landscape"
-#~ msgstr "Horitzontal"
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#~ msgid "Left:"
-#~ msgstr "Esquerra:"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Par�metres"
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Tabuladors de carta al costat"
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
+msgstr "_Missatge"
 
-#~ msgid "Margins"
-#~ msgstr "Marges"
+#: ui/evolution-mail.xml.h:70
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "_Mou a la carpeta"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Nombre de columnes:"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Obre la tasca"
 
-#~ msgid "Options"
-#~ msgstr "Opcions"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#~ msgid "Orientation"
-#~ msgstr "Orientaci�"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr "_En cadena"
 
-#~ msgid "Page"
-#~ msgstr "P�gina"
+#: ui/evolution-mail.xml.h:77
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Suprimeix"
 
-#~ msgid "Page Setup:"
-#~ msgstr "Configuraci� de la p�gina:"
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Adjunta"
 
-#~ msgid "Paper"
-#~ msgstr "Paper"
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+#, fuzzy
+msgid "Close the current file"
+msgstr "l'hora actual"
 
-#~ msgid "Paper source:"
-#~ msgstr "Font del paper:"
+#: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Edita el missatge"
 
-#~ msgid "Portrait"
-#~ msgstr "Vertical"
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "F_ormat"
 
-#~ msgid "Preview:"
-#~ msgstr "Previsualitzaci�:"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr "HTML"
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Imprimeix usant ombrejat de grisos"
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr "Insereix un fitxer com a text dins del missatge"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Inverteix-ho per a les p�gines senars"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Insert text file..."
+msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#~ msgid "Right:"
-#~ msgstr "Dreta:"
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
+msgid "Open a file"
+msgstr "Obre un fitxer"
 
-#~ msgid "Sections:"
-#~ msgstr "Seccions:"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
 
-#~ msgid "Shading"
-#~ msgstr "Ombrejat"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
 
-#~ msgid "Size:"
-#~ msgstr "Mida:"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
 
-#~ msgid "Start on a new page"
-#~ msgstr "Comen�a en una nova p�gina"
+#: ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Desa a la _carpeta..."
 
-#~ msgid "Style name:"
-#~ msgstr "Nom de l'estil:"
+#: ui/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Desa a la _carpeta..."
 
-#~ msgid "Top:"
-#~ msgstr "Superior:"
+#: ui/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "l'hora actual"
 
-#~ msgid "Type:"
-#~ msgstr "Tipus:"
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr "Desa el missatge a una carpeta determinada"
 
-#~ msgid "Width:"
-#~ msgstr "Amplada:"
+#: ui/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Send"
+msgstr "_Envia"
 
-#~ msgid "label26"
-#~ msgstr "etiqueta26"
+#: ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send _Later"
+msgstr "Remitent"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Agenda"
+msgid "Send _later"
+msgstr "Remitent"
 
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr ""
-#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
+msgid "Send the mail in HTML format"
+msgstr "Envia els missatges en format HTML"
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Conducte de l'agenda de l'Evolution"
+msgid "Send the message later"
+msgstr "Envia aquest missatge"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
-#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Send the message now"
+msgstr "Envia aquest missatge"
 
-#~ msgid "Edit appointment"
-#~ msgstr "Edita una cita"
+#: ui/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send this message now"
+msgstr "Envia aquest missatge"
 
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Durada de l'snooze (minuts)"
+#: ui/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Mostra/amaga les adjuncions"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minuts"
+#: ui/evolution-message-composer.xml.h:31
+msgid "Show _attachments"
+msgstr "Mostra les _adjuncions"
 
-#~ msgid "10 minutes"
-#~ msgstr "10 minuts"
+#: ui/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show attachments"
+msgstr "Mostra les _adjuncions"
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 hores (am/pm)"
+#: ui/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "S'est� enviant el missatge sense cap asuumpte"
 
-#~ msgid "15 minutes"
-#~ msgstr "15 minuts"
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#~ msgid "24 hour"
-#~ msgstr "24 hores"
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#~ msgid "30 minutes"
-#~ msgstr "30 minuts"
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#~ msgid "60 minutes"
-#~ msgstr "60 minuts"
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
-#~ msgid "Alarms timeout after"
-#~ msgstr "Les alarmes es desactiven despr�s de"
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "_Bcc Field"
+msgstr "Camps"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Alarmes ac�stiques"
+#: ui/evolution-message-composer.xml.h:40
+#, fuzzy
+msgid "_Cc Field"
+msgstr "Camps"
 
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Fes un so quan aparegui una finestra d'alarma."
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "Calendar"
-#~ msgstr "Agenda"
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Insert"
+msgstr "_�ndex"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Prefer�ncies de l'agenda"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#~ msgid "Colors"
-#~ msgstr "Colors"
+#: ui/evolution-message-composer.xml.h:49
+#, fuzzy
+msgid "_Open..."
+msgstr "_Obre..."
 
-#~ msgid "Compress weekends"
-#~ msgstr "Comprimeix els caps de setmana"
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Respon"
 
-#~ msgid "Date navigator options"
-#~ msgstr "Opcions del navegador de dates"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
 
-#~ msgid "Defaults"
-#~ msgstr "Valors predeterminats"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Afegeix una carpeta a la llista de carpetes a qu� estic subscrit"
 
-#~ msgid "Display options"
-#~ msgstr "Opcions de visualitzaci�"
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "C_arpeta"
 
-#~ msgid "Enable snoozing for"
-#~ msgstr "Habilita l'snoozing per a"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr "Refresca la llista"
 
-#~ msgid "End of day:"
-#~ msgstr "Final del dia:"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr "Refresca la llista de carpetes"
 
-#~ msgid "First day of week:"
-#~ msgstr "primer dia de la setmana:"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Elimina la carpeta de la llista de carpetes a qu� estic subscrit"
 
-#~ msgid "Highlight"
-#~ msgstr "Ressalta"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr "Subscriu-me"
 
-#~ msgid "Items Due Today"
-#~ msgstr "Elemts que vencen avui"
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr "Cancel�la la subscripci�"
 
-#~ msgid "Items Due Today:"
-#~ msgstr "Elements que vencen avui:"
+#: ui/evolution-task-editor-dialog.xml.h:5
+#, fuzzy
+msgid "Assig_n Task (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#~ msgid "Items Not Yet Due"
-#~ msgstr "Elements que encara no han ven�ut"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
 
-#~ msgid "Items Not Yet Due:"
-#~ msgstr "Elements que encara no han ven�ut:"
+#: ui/evolution-task-editor-dialog.xml.h:29
+#, fuzzy
+msgid "Meeting Re_quest (FIXME)"
+msgstr "FIXME: Pe_tici� de cita"
 
-#~ msgid "Overdue Items"
-#~ msgstr "Elements ven�uts"
+#: ui/evolution-task-editor-dialog.xml.h:43
+#, fuzzy
+msgid "Redo"
+msgstr "R�dio"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Elements que ja han ven�ut:"
+#: ui/evolution-task-editor-dialog.xml.h:44
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Elimina una acci�"
 
-#~ msgid "Pick a color"
-#~ msgstr "Agafa un color"
+#: ui/evolution-task-editor-dialog.xml.h:45
+#, fuzzy
+msgid "Replace"
+msgstr "Respon"
 
-#~ msgid "Remind me of all appointments"
-#~ msgstr "Recorda'm totes les cites"
+#: ui/evolution-task-editor-dialog.xml.h:46
+#, fuzzy
+msgid "Replace a string"
+msgstr "_Cerca contactes"
 
-#~ msgid "Reminders"
-#~ msgstr "Recordatoris"
+#: ui/evolution-task-editor-dialog.xml.h:47
+#, fuzzy
+msgid "Reply to A_ll (FIXME)"
+msgstr "Respon a tots"
 
-#~ msgid "Show"
-#~ msgstr "Mostra"
+#: ui/evolution-task-editor-dialog.xml.h:48
+#, fuzzy
+msgid "S_end Status Report (FIXME)"
+msgstr "_Contacte (FIXME)"
 
-#~ msgid "Show week numbers"
-#~ msgstr "Mostra els n�meros de les setmanes"
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
 
-#~ msgid "Start of day:"
-#~ msgstr "Inici del dia:"
+#: ui/evolution-task-editor-dialog.xml.h:54
+#, fuzzy
+msgid "Save the task and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de di�leg"
 
-#~ msgid "TaskPad"
-#~ msgstr "TaskPad"
+#: ui/evolution-task-editor-dialog.xml.h:55
+#, fuzzy
+msgid "Search again for the same string"
+msgstr "_Cerca contactes"
 
-#~ msgid "Time Until Due"
-#~ msgstr "Temps fins al venciment"
+#: ui/evolution-task-editor-dialog.xml.h:56
+#, fuzzy
+msgid "Search for a string"
+msgstr "_Cerca contactes"
 
-#~ msgid "Time divisions:"
-#~ msgstr "Divisions de temps:"
+#: ui/evolution-task-editor-dialog.xml.h:61
+#, fuzzy
+msgid "Undo"
+msgstr "_Envia"
 
-#~ msgid "Time format:"
-#~ msgstr "Format de l'hora:"
+#: ui/evolution-task-editor-dialog.xml.h:62
+#, fuzzy
+msgid "Undo the last action"
+msgstr "Elimina una acci�"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes visuals"
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
 
-#~ msgid "Work week"
-#~ msgstr "Setmana de treball"
+#: ui/evolution-task-editor-dialog.xml.h:77
+#, fuzzy
+msgid "_Mark Complete (FIXME)"
+msgstr "Marca com a completa"
 
-#~ msgid "minutes before they occur."
-#~ msgstr "minuts abans que es produeixin."
+#: ui/evolution-task-editor-dialog.xml.h:84
+#, fuzzy
+msgid "_Reply (FIXME)"
+msgstr "_Tasca (FIXME)"
 
-#~ msgid "seconds."
-#~ msgstr "segons."
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
 
-#~ msgid "% Comp_lete:"
-#~ msgstr "% comp_let:"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "New Task"
+msgstr "Tasca"
 
-#~ msgid "C_lassification:"
-#~ msgstr "C_lassificaci�:"
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Save task as something else"
+msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#~ msgid "Date Completed:"
-#~ msgstr "Data completa:"
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Tasks Preferences..."
+msgstr "Prefer�ncies de l'agenda..."
 
-#~ msgid "High"
-#~ msgstr "Alta"
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Tasca"
 
-#~ msgid "In Progress"
-#~ msgstr "En proc�s"
+#: ui/evolution.xml.h:1
+#, fuzzy
+msgid "About Evolution..."
+msgstr "_Quant a l'Evolution..."
 
-#~ msgid "Low"
-#~ msgstr "Baixa"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
 
-#~ msgid "Normal"
-#~ msgstr "Normal"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#~ msgid "Not Started"
-#~ msgstr "No iniciat"
+#: ui/evolution.xml.h:5
+#, fuzzy
+msgid "Customize"
+msgstr "Cerca personalitzada"
 
-#~ msgid "Task"
-#~ msgstr "Tasca"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactes..."
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr "Mostra una altra carpeta"
 
-#~ msgid "_Due Date:"
-#~ msgstr "_Data de venciment:"
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr "S_urt"
 
-#~ msgid "_Priority:"
-#~ msgstr "_Prioritat:"
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr "Barra de _dreceres de l'Evolution"
 
-#~ msgid "_Status:"
-#~ msgstr "_Estat:"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr "Surt del programa"
 
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr "Per _comen�ar"
 
-#~ msgid "A_ll day event"
-#~ msgstr "Esdeveniment per a _tot el dia"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#~ msgid "Appointment Basics"
-#~ msgstr "Temes fonamentals sobre les cites"
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#~ msgid "Custom recurrence"
-#~ msgstr "Recurr�ncia personalitzada"
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr "Mostra informaci� referent a l'Evolution"
 
-#~ msgid "Days"
-#~ msgstr "Dies"
+#: ui/evolution.xml.h:15
+#, fuzzy
+msgid "Submit Bug Report"
+msgstr "_Envia un informe d'error"
 
-#~ msgid "Every"
-#~ msgstr "Cada"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Envia un informe d'error"
 
-#~ msgid "Exceptions"
-#~ msgstr "Excepcions"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
+msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#~ msgid "Hours"
-#~ msgstr "Hores"
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#~ msgid "Mail _to:"
-#~ msgstr "Envia per correu _a:"
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#~ msgid "Minutes"
-#~ msgstr "Minuts"
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr "Utilitzaci� del gestor de c_ontactes"
 
-#~ msgid "Modify"
-#~ msgstr "Modifica"
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr "Utilitzaci� de l'_agenda"
 
-#~ msgid "No recurrence"
-#~ msgstr "Sense recurr�ncia"
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr "Utilitzaci� del _gestor de correu"
 
+#: ui/evolution.xml.h:23
 #, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Previsualitzaci�:"
+msgid "Work Offline"
+msgstr "S'est� movent"
 
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vat"
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr "_Quant a l'Evolution..."
 
-#~ msgid "Pu_blic"
-#~ msgstr "P�_blic"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
+msgstr "_Carpeta"
 
-#~ msgid "Recurrence"
-#~ msgstr "Recurr�ncia"
+#: ui/evolution.xml.h:32
+msgid "_Go to Folder..."
+msgstr "_V�s a la carpeta..."
 
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regla de recurr�ncia"
+#: ui/evolution.xml.h:34
+#, fuzzy
+msgid "_Import file..."
+msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#~ msgid "Reminder"
-#~ msgstr "Recordatori"
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr "_�ndex"
 
-#~ msgid "Simple recurrence"
-#~ msgstr "Recurr�ncia simple"
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Mail message"
+msgstr "Missatge de _correu (FIXME)"
 
-#~ msgid "Su_mmary:"
-#~ msgstr "Resu_m:"
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nova VFolder"
 
-#~ msgid "Time"
-#~ msgstr "Temps"
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Mostra la barra de _dreceres"
 
-#~ msgid "_Audio"
-#~ msgstr "_�udio"
+#. 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 "_Confidential"
-#~ msgstr "_Confidencial"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupat"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correu"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Fora de l'oficina"
 
-#~ msgid "_Program"
-#~ msgstr "_Programa"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Cap informaci�"
 
-#~ msgid "_Run program:"
-#~ msgstr "_Executa el programa:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_Invita a altres..."
 
-#~ msgid "_Start time:"
-#~ msgstr "Hora d'_inici:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opcions"
 
-#~ msgid "_Starting date:"
-#~ msgstr "Data d'_inici:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Mostra _nom�s les hores de treball"
 
-#~ msgid "day(s)"
-#~ msgstr "dia(es)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Mostra-ho reduint el zoom"
 
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Actualitza lliure/ocupat"
 
-#~ msgid "for"
-#~ msgstr "per a"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "forever"
-#~ msgstr "per sempre"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "Tria autom�tica"
 
-#~ msgid "label21"
-#~ msgstr "etiqueta21"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "month(s)"
-#~ msgstr "mes(os)"
+#: 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"
 
-#~ msgid "until"
-#~ msgstr "fins a"
+#: 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"
 
-#~ msgid "week(s)"
-#~ msgstr "setmana(es)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora d'_inici de la reuni�:"
 
-#~ msgid "year(s)"
-#~ msgstr "any(s)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "No s'ha pogut crear una agenda a `%s'"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Tots els assistents"
 
+#: widgets/menus/gal-view-menus.c:171
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "abril"
+msgid "_Current View"
+msgstr "l'hora actual"
 
-#, fuzzy
-#~ msgid "August"
-#~ msgstr "agost"
+#. 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:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Ara"
+
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
 #, fuzzy
-#~ msgid "December"
-#~ msgstr "desembre"
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: 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"
+
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
 #, fuzzy
-#~ msgid "February"
-#~ msgstr "febrer"
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
+#: widgets/misc/e-filter-bar.c:160
 #, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "V�s a una data"
+msgid "Save Search"
+msgstr "Cerca"
 
+#: widgets/misc/e-filter-bar.c:231
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "V�s a avui"
+msgid "Advanced Search"
+msgstr "Afegeix..."
 
+#: widgets/misc/e-filter-bar.c:311
 #, fuzzy
-#~ msgid "January"
-#~ msgstr "gener"
+msgid "Advanced ..."
+msgstr "Afegeix..."
 
+#: widgets/misc/e-messagebox.c:141
 #, fuzzy
-#~ msgid "July"
-#~ msgstr "juliol"
+msgid "Information"
+msgstr "Cap informaci�"
 
+#: widgets/misc/e-messagebox.c:148
 #, fuzzy
-#~ msgid "June"
-#~ msgstr "juny"
+msgid "Warning"
+msgstr "S'est� movent"
 
+#: widgets/misc/e-messagebox.c:162
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "mar�"
+msgid "Question"
+msgstr "Descripci�:"
 
+#: widgets/misc/e-messagebox.c:169
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Dilluns"
+msgid "Message"
+msgstr "_Missatge"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
 #, fuzzy
-#~ msgid "November"
-#~ msgstr "novembre"
+msgid "Don't show this message again."
+msgstr "Envia aquest missatge"
 
+#: widgets/misc/e-search-bar.c:140
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "octubre"
+msgid "Sear_ch"
+msgstr "Cerca"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "September"
-#~ msgstr "setembre"
+msgid "The Personal Addressbook Server"
+msgstr "Afegeix una font"
 
-#~ msgid "Attachment properties"
-#~ msgstr "Propietats de l'adjunci�"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
-#~ msgid "File name:"
-#~ msgstr "Nom del fitxer:"
+#: wombat/wombat.c:153
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#~ msgid "MIME type:"
-#~ msgstr "Tipus de MIME:"
+#: wombat/wombat.c:165
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#~ msgid "Edit VFolders"
-#~ msgstr "Edita les VFolders"
+#: wombat/wombat.c:178
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#~ msgid "Filter Rules"
-#~ msgstr "Regles del filtre"
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #, fuzzy
-#~ msgid "Incoming"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "Fitxers de correu en format mbox d'UNIX"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
 #~ msgstr ""
-#~ "Entrant\n"
-#~ "Sortint\n"
+#~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu en "
+#~ "el disc local."
 
 #, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Contorn:"
+#~ msgid "Connecting to server"
+#~ msgstr "Connexi� de prova a \"%s\""
 
-#~ msgid "Virtual Folders"
-#~ msgstr "Carpetes virtuals"
-
-#~ msgid "vFolder Sources"
-#~ msgstr "Fonts de la vFolder"
+#, fuzzy
+#~ msgid "Connect to server"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#~ msgid "Save"
-#~ msgstr "Desa"
+#~ msgid "New"
+#~ msgstr "Nou"
 
 #, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mostra"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Amaga"
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Suprimeix"
+#~ msgid "Disabled"
+#~ msgstr "Inhabilitat"
 
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Assumpte"
+#~ msgid "Synchronize"
+#~ msgstr "Sincronitza"
 
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Filtre sobre el remitent"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copia des del Pilot"
 
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Mou el missatge"
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copia al Pilot"
 
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assumpte"
+#~ msgid "Merge From Pilot"
+#~ msgstr "Fusiona des del Pilot"
 
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "No s'ha pogut iniciar el wombat"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Fusiona cap al Pilot"
 
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Format"
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Tipus de font de not�cies:"
+#~ msgid "Original Author:"
+#~ msgstr "Autor original:"
 
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "You have no mail sources configured"
-#~ msgstr "No teniu configurada cap font de correu"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 la Free Software Foundation i Helix Code"
 
-#, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Cap informaci�"
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propietats de l'adjunci�"
+#~ msgid "Synchronize Action"
+#~ msgstr "Sincronitza l'acci�"
 
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Afegeix..."
+#~ msgid "Conduit state"
+#~ msgstr "Estat del conducte"
 
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autenticaci�:"
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "No s'ha configurat cap Pilot, escolliu primer el\n"
+#~ "capplet 'Pilot Link Properties'."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Sense connexi� al dimoni gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "S'ha produ�t un error en intentar recollir\n"
+#~ "la llista del Pilot del dimoni gnome-pilot"
 
 #, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticaci�:"
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Dr.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ 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"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Conducte de les coses per fer de l'Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de les coses per fer de "
+#~ "l'Evolution.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "La prioritat ha d'estar entre 1 i 9, ambd�s inclosos"
+
+#~ msgid "Open..."
+#~ msgstr "_Obre..."
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Edita aquesta cita..."
 
 #, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "No suprimeixis els missatges del servidor"
+#~ msgid "Local folders may not be nested."
+#~ msgstr "Les carpetes Mbox no es poden imbricar."
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Introdu�u la identitat amb la qual voleu enviar aquest missatge"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Introdu�u l'assumpte del correu"
+
+#~ msgid "Saving changes to message..."
+#~ msgstr "S'estan desant els canvis al missatge..."
+
+#~ msgid "Save changes to message..."
+#~ msgstr "Desa els canvis al missatge..."
+
+#~ msgid "Error saving composition to 'Drafts': %s"
+#~ msgstr "Error en desar la redacci� a 'Esborranys': %s"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Edita una regla de filtre"
 
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "Cap"
+#~ msgid "outgoing"
+#~ msgstr "Agrupament"
+
+#~ msgid "Add Rule"
+#~ msgstr "Afegeix una regla"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Afegeix una regla de la VFolder"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Edita una regla de la VFolder"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "El cos o l'assumpte contenen"
+
+#~ msgid "Body contains"
+#~ msgstr "El cos cont�"
+
+#~ msgid "Subject contains"
+#~ msgstr "L'assumpte cont�"
+
+#~ msgid "Body does not contain"
+#~ msgstr "El cos no cont�"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "L'assumpte no cont�"
+
+#~ msgid "You have no Outbox configured"
+#~ msgstr "No teniu configurada cap b�stia de sortida"
+
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer %s:\n"
+#~ "%s"
 
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adre�a electr�nica:"
+#~ msgid "Registering local folder"
+#~ msgstr "Creaci� d'una nova carpeta"
 
 #, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Adre�a electr�nica:"
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#~ msgid "Fetching email from %s"
+#~ msgstr "S'est� recollint el correu des de %s"
+
+#~ msgid "Fetch email from %s"
+#~ msgstr "Recull el correu des de %s"
+
+#~ msgid "Filtering email on demand"
+#~ msgstr "S'est� filtrant el correu sota demanda"
+
+#~ msgid "Filter email on demand"
+#~ msgstr "Filtra el correu sota demanda"
+
+#~ msgid "Sending queue"
+#~ msgstr "S'est� enviant la cua"
+
+#~ msgid "Send queue"
+#~ msgstr "Envia la cua"
+
+#~ msgid "Appending \"%s\""
+#~ msgstr "S'est� afegint \"%s\""
+
+#~ msgid "Appending a message without a subject"
+#~ msgstr "S'est� afegint un missatge sense cap assumpte"
+
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "S'estan movent els missatges des de \"%s\" cap a \"%s\""
+
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "S'estan copiant els missatges des de \"%s\" cap a \"%s\""
+
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Mou els missatges des de \"%s\" cap a \"%s\""
+
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
+
+#~ msgid "(No description)"
+#~ msgstr "(Sense descripci�)"
 
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuraci� del correu"
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "S'est� carregant la carpeta %s"
 
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Nom complet:"
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Carrega la carpeta %s"
+
+#~ msgid ""
+#~ "Error while preparing to %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en preparar-se per a %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en `%s':\n"
+#~ "%s"
+
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "S'ha produ�t un error en llegir les ordres de la cadena cursada."
+
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr "Missatge malm�s de la cadena cursada?"
+
+#~ msgid "Could not create dialog box."
+#~ msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#~ msgid "User cancelled query."
+#~ msgstr "Consulta cancel�lada per l'usuari."
+
+#~ msgid "Examining %s"
+#~ msgstr "S'est� examinant %s"
+
+#~ msgid ""
+#~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
+#~ msgstr ""
+#~ "No s'ha pogut llegir el fitxer de la mem�ria cau UID \"%s\". �s possible que "
+#~ "rebeu missatges duplicats."
+
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "S'est� recuperant el missatge %d de %d"
+
+#~ msgid "Writing message %d of %d"
+#~ msgstr "S'est� escrivint el missatge %d de %d"
+
+#~ msgid "Saving changes to %s"
+#~ msgstr "S'estan desant els canvis a %s"
+
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No es pot obrir la ubicaci� `%s':\n"
+#~ "%s"
 
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'usuari:"
+#~ msgid "Subscribe to folder \"%s\""
+#~ msgstr "Escaneja les carpetes de \"%s\""
 
 #, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAPv4"
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#~ msgid "Identity"
-#~ msgstr "Identitat"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Cita"
 
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correu"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Contacte"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Tasca"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: _Petici� de tasca"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: Entrada al _diari"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Nota"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Tr_ia el formulari..."
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "FIXME: Estil _memo"
 
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "cont�"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "FIXME: Defineix els e_stils d'impressi�..."
 
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuraci� del correu"
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: E_nvia"
 
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Configuraci� del correu"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Invita els assistents..."
 
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "Nou"
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "_Mou a la carpeta"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Opcions"
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: Tr_ia el formulari..."
 
-#~ msgid "Organization:"
-#~ msgstr "Organitzaci�:"
+#~ msgid "Page Set_up"
+#~ msgstr "Con_figuraci� de la p�gina"
 
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Contrasenya"
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Pre_visualitzaci� de la impressi�"
 
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Respon"
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "FIXME: Enganxa e_special..."
 
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "Persones _requerides"
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "Marca'l com a per _llegir"
 
-#, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Desa com a VCard"
+#~ msgid "_Object"
+#~ msgstr "_Objecte"
+
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Element"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: Element per _llegir"
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: E_st�ndard"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Fitxer de signatura:"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "FIXME: S'est� __formatant"
+
+#~ msgid "FIXME: _Customize..."
+#~ msgstr "FIXME: _Personalitza..."
+
+#~ msgid "Ne_xt"
+#~ msgstr "Se_g�ent"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Barres d'eines"
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Fitxer..."
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: El_ement..."
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Objecte..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Lletra..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _Par�graf..."
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Diss_enya aquest formulari"
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: D_issenya un formulari..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Publica el _formulari..."
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: Pu_blica el formulari com a..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: _Depurador de seq��ncies"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Ortografia..."
+
+#~ msgid "_Forms"
+#~ msgstr "_Formularis"
+
+#~ 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"
 
 #, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Sendmail"
+#~ msgid "FIXME: New _Message 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 "FIXME: For_ward"
+#~ msgstr "FIXME: Reen_via"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "FIXME: Anterior"
+
+#~ msgid "FIXME: Next"
+#~ msgstr "FIXME: Seg�ent"
+
+#~ msgid "Group %i"
+#~ msgstr "Grup %i"
+
+#~ msgid "label26"
+#~ msgstr "etiqueta26"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassificaci�:"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "Days"
+#~ msgstr "Dies"
+
+#~ msgid "Hours"
+#~ msgstr "Hores"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Envia per correu _a:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuts"
+
+#~ msgid "Time"
+#~ msgstr "Temps"
+
+#~ msgid "_Audio"
+#~ msgstr "_�udio"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correu"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "label21"
+#~ msgstr "etiqueta21"
 
 #, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Configuraci� del correu"
+#~ msgid "Show all hidden"
+#~ msgstr "Mostra"
 
 #, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Servidor:"
+#~ msgid "Hide deleted"
+#~ msgstr "Suprimeix"
 
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
+#~ msgid "Hide Subject"
+#~ msgstr "Assumpte"
 
-#~ msgid "Signature file:"
-#~ msgstr "Fitxer de signatura:"
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Filtre sobre el remitent"
 
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Fitxer de signatura:"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Assumpte"
 
-#~ msgid "Sources"
-#~ msgstr "Fonts"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "No teniu configurada cap font de correu"
 
 #, fuzzy
-#~ msgid "Type"
-#~ msgstr "Tipus:"
+#~ msgid "Account Properties"
+#~ msgstr "Propietats de l'adjunci�"
 
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Cap informaci�"
-
-#~ msgid "Username:"
-#~ msgstr "Nom d'usuari:"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Adre�a electr�nica:"
 
 #, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minuts"
+#~ msgid "Reply-to:"
+#~ msgstr "Respon"
 
 #~ msgid ""
 #~ "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -6097,9 +9209,6 @@ msgstr "Grup %i"
 #~ msgid "Full name:"
 #~ msgstr "Nom complet:"
 
-#~ msgid "Email address:"
-#~ msgstr "Adre�a electr�nica:"
-
 #~ msgid "Signature File"
 #~ msgstr "Fitxer de signatura"
 
@@ -6112,9 +9221,6 @@ msgstr "Grup %i"
 #~ 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:"
 
@@ -6168,9 +9274,6 @@ msgstr "Grup %i"
 #~ msgid "Edit Identity"
 #~ msgstr "Edita la identitat"
 
-#~ msgid "Add Source"
-#~ msgstr "Afegeix una font"
-
 #~ msgid "Edit Source"
 #~ msgstr "Edita la font"
 
@@ -6192,9 +9295,6 @@ msgstr "Grup %i"
 #~ msgid "Query authorization at \"%s\""
 #~ msgstr "Autoritzaci� de consultes a \"%s\""
 
-#~ msgid "Address"
-#~ msgstr "Adre�a"
-
 #~ msgid "Identities"
 #~ msgstr "Identitats"
 
@@ -6204,9 +9304,6 @@ msgstr "Grup %i"
 #~ 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"
 
@@ -6216,30 +9313,6 @@ msgstr "Grup %i"
 #~ msgid "Send messages in HTML format"
 #~ msgstr "Envia els missatges en format HTML"
 
-#~ msgid "Delete a contact"
-#~ msgstr "Suprimeix un contacte"
-
-#~ msgid "Find"
-#~ msgstr "Cerca"
-
-#~ msgid "Find a contact"
-#~ msgstr "Cerca un contacte"
-
-#~ msgid "Print contacts"
-#~ msgstr "Imprimeix els contactes"
-
-#~ msgid "Stop"
-#~ msgstr "Atura"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Atura la c�rrega"
-
-#~ msgid "View All"
-#~ msgstr "Visualitza'ls tots"
-
-#~ msgid "View all contacts"
-#~ msgstr "Visualitza tots els contactes"
-
 #, fuzzy
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "Configuraci� del _correu..."
@@ -6247,181 +9320,19 @@ msgstr "Grup %i"
 #~ 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"
-
 #, fuzzy
 #~ 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"
-
-#, fuzzy
-#~ 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"
 
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Anomena i desa..."
-
-#~ msgid "Delete this item"
-#~ msgstr "Suprimeix aquest element"
-
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "Help"
-#~ msgstr "_Ajuda"
-
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Imprimeix el missatge..."
-
-#~ msgid "Print this item"
-#~ msgstr "Imprimeix aquest element"
-
-#~ msgid "Print..."
-#~ msgstr "Imprimeix..."
-
-#, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Anomena i desa..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Desa i tanca"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Desa el contacte i tanca el quadre de di�leg"
-
-#~ msgid "See online help"
-#~ msgstr "Consulta l'ajuda en l�nia"
-
-#, fuzzy
-#~ msgid "Send _message to contact..."
-#~ msgstr "FIXME: Nou _missatge per contactar"
-
-#~ msgid "_File"
-#~ msgstr "_Fitxer"
-
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimeix..."
-
-#~ msgid "_Save"
-#~ msgstr "_Desa"
-
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Lletra..."
-
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Personalitzat"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "_Inverteix la selecci�"
-
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Suprimeix aquesta cita"
-
-#~ msgid "Copy"
-#~ msgstr "Copia"
-
-#, fuzzy
-#~ msgid "Cut"
-#~ msgstr "Personalitzat"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Llibreta d'adreces..."
-
 #~ msgid "FIXME: Chec_k Names"
 #~ msgstr "FIXME: Comp_rova els noms"
 
-#~ msgid "FIXME: Forward as v_Calendar"
-#~ msgstr "FIXME: Reenvia com a v_Calendar"
-
 #~ msgid "FIXME: Help"
 #~ msgstr "FIXME: Ajuda"
 
@@ -6440,101 +9351,9 @@ msgstr "Grup %i"
 #~ msgstr "FIXME: _Nova cita"
 
 #, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propietats de la llista de coses per fer"
-
-#, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "Seg�ent"
-
-#~ msgid "Paste"
-#~ msgstr "Enganxa"
-
-#, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Enganxa l'element del porta-retalls"
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "Ant_erior"
-
-#, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Imprimeix..."
-
-#, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Configuraci� de la p�gina:"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propietats..."
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "R�dio"
-
-#, fuzzy
-#~ msgid "Redo the undone action"
-#~ msgstr "Elimina una acci�"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Respon"
-
-#, fuzzy
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Desa el contacte i tanca el quadre de di�leg"
-
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "l'hora actual"
-
-#, fuzzy
-#~ msgid "Search for a string"
-#~ msgstr "_Cerca contactes"
-
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Selecciona'ls _tots"
-
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Seleccioneu una carpeta"
-
-#, fuzzy
-#~ msgid "_About..."
-#~ msgstr "_Quant a l'Evolution..."
-
-#, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Tanca"
-
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Copia"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edita"
-
-#, fuzzy
 #~ msgid "_Find..."
 #~ msgstr "Cerca..."
 
-#~ msgid "_Help"
-#~ msgstr "_Ajuda"
-
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Enganxa"
-
-#~ msgid "_Print"
-#~ msgstr "_Imprimeix"
-
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Propietats..."
-
 #, fuzzy
 #~ msgid "_Redo"
 #~ msgstr "R�dio"
@@ -6543,135 +9362,40 @@ msgstr "Grup %i"
 #~ msgid "_Replace..."
 #~ msgstr "_Tanca..."
 
-#, fuzzy
-#~ 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"
-
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Suprimeix el missatge"
-
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Missatge reenviat - %s"
-
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimeix el missatge seleccionat"
-
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtres de correu ..."
-
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Gestiona les subscripcions..."
-
 #~ 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"
-
 #, fuzzy
 #~ 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"
-
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Copia a la carpeta"
-
 #~ msgid "_Edit Message"
 #~ msgstr "_Edita el missatge"
 
-#~ msgid "_Expunge"
-#~ msgstr "_Esborra"
-
 #~ 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"
-
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Mou a la carpeta"
-
 #~ msgid "_Open in New Window"
 #~ msgstr "_Obre'l en una nova finestra"
 
@@ -6686,198 +9410,12 @@ msgstr "Grup %i"
 #~ msgid "_Source"
 #~ msgstr "Font"
 
-#~ msgid "_Threaded"
-#~ msgstr "_En cadena"
-
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "_Suprimeix"
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_VFolder sobre l'assumpte"
 
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Editor de carpetes _virtuals..."
-
-#~ msgid "Attach"
-#~ msgstr "Adjunta"
-
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "l'hora actual"
-
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Edita el missatge"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Insereix un fitxer com a text dins del missatge"
-
-#, fuzzy
-#~ msgid "Insert text file..."
-#~ msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Obre un fitxer"
-
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "_Anomena i desa"
-
-#, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Desa a la _carpeta..."
-
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Desa a la _carpeta..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Desa el missatge a una carpeta determinada"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Envia"
-
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Remitent"
-
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Remitent"
-
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Envia els missatges en format HTML"
-
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Mostra/amaga les adjuncions"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Mostra les _adjuncions"
-
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "S'est� enviant el missatge sense cap asuumpte"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Obre..."
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Afegeix una carpeta a la llista de carpetes a qu� estic subscrit"
-
-#~ msgid "Refresh List"
-#~ msgstr "Refresca la llista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Refresca la llista de carpetes"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Elimina la carpeta de la llista de carpetes a qu� estic subscrit"
-
-#~ msgid "Subscribe"
-#~ msgstr "Subscriu-me"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Cancel�la la subscripci�"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Mostra una altra carpeta"
-
-#~ msgid "E_xit"
-#~ msgstr "S_urt"
-
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Barra de _dreceres de l'Evolution"
-
-#~ msgid "Exit the program"
-#~ msgstr "Surt del programa"
-
-#~ msgid "Getting _Started"
-#~ msgstr "Per _comen�ar"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "Mostra informaci� referent a l'Evolution"
-
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Mostra la barra de _carpetes"
 
-#, fuzzy
-#~ msgid "Submit _Bug Report"
-#~ msgstr "_Envia un informe d'error"
-
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
-
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Utilitzaci� del gestor de c_ontactes"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Utilitzaci� de l'_agenda"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Utilitzaci� del _gestor de correu"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Quant a l'Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Cita (FIXME)"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacte (FIXME)"
-
-#~ msgid "_Folder"
-#~ msgstr "_Carpeta"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_V�s a la carpeta..."
-
-#~ msgid "_Index"
-#~ msgstr "_�ndex"
-
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Missatge de _correu (FIXME)"
-
-#~ 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:"
-
 #~ msgid "Available Categories:"
 #~ msgstr "Categories disponibles:"
 
@@ -6893,12 +9431,6 @@ msgstr "Grup %i"
 #~ msgid "Headings:"
 #~ msgstr "Encap�alaments:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Dies buits:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Cites:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Dia ressaltat:"
 
@@ -6920,9 +9452,6 @@ msgstr "Grup %i"
 #~ msgid "may"
 #~ msgstr "maig"
 
-#~ msgid "sept"
-#~ msgstr "set"
-
 #~ msgid "sunday"
 #~ msgstr "diumenge"
 
@@ -7034,16 +9563,6 @@ msgstr "Grup %i"
 #~ msgid "Mail Source"
 #~ msgstr "Font del correu"
 
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "Ja teniu enllestida la configuraci� del correu.\n"
-#~ "Feu clic a \"Finalitza\" per desar els nous par�metres"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "Envia \"%s\""
-
 #~ msgid "Send a message without a subject"
 #~ msgstr "Envia un missatge sense assumpte"
 
@@ -7068,9 +9587,6 @@ msgstr "Grup %i"
 #~ msgid "Attach messages from \"%s\""
 #~ msgstr "Adjunta els missatges des de \"%s\""
 
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "S'estan reenviant els missatges \"%s\""
-
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "S'est� reenviant un missatge sense cap assumpte"
 
@@ -7115,9 +9631,6 @@ msgstr "Grup %i"
 #~ msgid "Display message UID \"%s\""
 #~ msgstr "Visualitza l'UID del missatge \"%s\""
 
-#~ msgid "Clear message display"
-#~ msgstr "Esborra la visualitzaci� del missatge"
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -7134,10 +9647,6 @@ msgstr "Grup %i"
 #~ msgstr "S'est� recuperant el missatge %d de %d (uid \"%s\")"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -7150,9 +9659,6 @@ msgstr "Grup %i"
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ou servidor de directori"
 
-#~ msgid "_Actions"
-#~ msgstr "_Accions"
-
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Anomena i desa l'agenda"
 
@@ -7191,9 +9697,6 @@ msgstr "Grup %i"
 #~ msgid "Edit to-do item"
 #~ msgstr "Edita un element per fer"
 
-#~ msgid "Summary:"
-#~ msgstr "Resum:"
-
 #~ msgid "Due Date:"
 #~ msgstr "Data de venciment:"
 
@@ -7226,9 +9729,6 @@ msgstr "Grup %i"
 #~ "vistes de dia i de setmana. Per defecte, les\n"
 #~ "hores fora d'aquest abast no es mostraran."
 
-#~ msgid "Day start:"
-#~ msgstr "Inici del dia:"
-
 #~ msgid "Day end:"
 #~ msgstr "Final del dia:"
 
@@ -7265,9 +9765,6 @@ msgstr "Grup %i"
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Les alarmes ac�stiques s'apaguen despr�s de"
 
-#~ msgid " seconds"
-#~ msgstr " segons"
-
 #~ msgid "Enable snoozing for "
 #~ msgstr "Habilita l'snoozing per a "
 
@@ -7316,12 +9813,6 @@ msgstr "Grup %i"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "URL d'emmagatzemament incorrecte (cap servidor): %s"
 
-#~ msgid "Custom search"
-#~ msgstr "Cerca personalitzada"
-
-#~ msgid "Full Search"
-#~ msgstr "Cerca completa"
-
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
 #~ "By filling in some information about your email\n"
@@ -7384,9 +9875,6 @@ msgstr "Grup %i"
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Crea una nova cita per a avui"
 
-#~ msgid "About Calendar"
-#~ msgstr "Sobre l'agenda"
-
 #~ msgid "%s%s"
 #~ msgstr "%2$s%1$s"
 
@@ -7420,9 +9908,6 @@ msgstr "Grup %i"
 #~ msgid "Add to-do item..."
 #~ msgstr "Afegeix un element per fer..."
 
-#~ msgid "Edit this item..."
-#~ msgstr "Edita aquest element..."
-
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
@@ -7507,9 +9992,6 @@ msgstr "Grup %i"
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "No es pot inicialitzar el sistema de configuraci�."
 
-#~ msgid "Fields"
-#~ msgstr "Camps"
-
 #~ msgid "Field Chooser"
 #~ msgstr "Selector de camps"
 
diff --git a/po/da.po b/po/da.po
index 44ade9dcd4..9dba8f5d6d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,11 +3,10 @@
 # Kenneth Christiansen <kenneth@gnome.dk>, 2000.
 # Keld Simonsen <keld@dkuug.dk>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-02-08 00:19+0100\n"
+"POT-Creation-Date: 2001-03-15 11:05+0100\n"
 "PO-Revision-Date: 2001-02-27 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -314,131 +313,13 @@ msgstr "Importerer GnomeCard-filer ind i Evolution."
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deaktiveret"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronis�r"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopi�r fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopi�r til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flet fra Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flet til Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevar <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Oprindelig forfatter:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <eskil@eazel.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution adressebogs-komponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "� 1998-2000 the Free Software Foundation og Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurationsv�rkt�j for evolutions adressebogskomponent.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkroniseringshandling"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Komponent-tilstand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen pilot er konfigureret, v�lg venligst\n"
-"kappleten 'Egenskaber for pilot link' f�rst."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ikke tilkoblet gnome-pilot d�mon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"En fejl opstod under fors�g p� at hente\n"
-"pilot-listen fra gnome-pilot d�monen"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�ren kunne ikke indl�ses\n"
@@ -464,19 +345,11 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke l�se pilotens adresseapplikationsblok"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Konfigur�r Udst�ende"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Udst�ende"
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Tilf�j"
 
@@ -517,7 +390,7 @@ msgstr "Gem som:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Generel"
 
@@ -534,7 +407,7 @@ msgid "Phone Types"
 msgstr "Telefontyper"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Prim�r epost"
 
@@ -547,6 +420,7 @@ msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Tilf�j"
 
@@ -571,8 +445,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -624,113 +498,132 @@ msgstr "_Dette er postadressen"
 msgid "Delete Contact?"
 msgstr "Slet kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:574
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt tilh�rer disse kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Sekret�r"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Andet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Prim�r epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Sekund�r epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Terti�r epost"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Redig�r filtre"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Fulde navn:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Epost"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -843,25 +736,25 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:236
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabel"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -881,27 +774,27 @@ msgstr ""
 "er det n�dvendigt at hente og installere OpenLDAP og\n"
 "rekompilere og installere Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Vis alt"
 
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr "Hvilkensomhelst felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr "Navn indeholder"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "Epost indeholder"
 
-#: addressbook/gui/component/addressbook.c:738
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "Uri'en som mappebladreren vil vise"
 
@@ -926,9 +819,9 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -969,7 +862,7 @@ msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "V�rt:"
 
@@ -998,12 +891,12 @@ msgid "Search Scope:"
 msgstr "S�geopr�de:"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Sti:"
 
@@ -1032,7 +925,7 @@ msgstr ""
 "den."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1057,21 +950,21 @@ msgstr "Kilder til adressebog"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:694
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Slet"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:680 mail/mail-config.glade.h:24
+#: 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:571
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Navn"
 
@@ -1079,32 +972,48 @@ msgstr "Navn"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Andre kontakter"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "En simpel Bonobo kontrol som viser en adressebog."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "En simpel Bonobo kontrol som viser en adressebog."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontrol der viser et minikort for Evolutions adressebog."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebogs minikort-viser"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for behandling af kontakter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik for kontrol af adressebog minikort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabrik for adressebogens gr�nseflade for navneudv�lgelse"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Konfigurationsv�rkt�j for evolutions adressebogskomponent.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Klik her for adressebogen"
@@ -1118,6 +1027,21 @@ msgstr "Evolution adressebogs-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik for adressebogens gr�nseflade for navneudv�lgelse"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Find..."
@@ -1246,64 +1170,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilf�je en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr "Netsted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr "Bem�rkning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Click here to add a contact"
 msgstr ""
 
@@ -1311,7 +1235,7 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1325,6 +1249,11 @@ msgstr ""
 "\n"
 "Dobbelt-klik her for at oprette en ny kontakt."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Kort: "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1482,7 +1411,7 @@ msgstr "Stilnavn:"
 msgid "Top:"
 msgstr "Top:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Type:"
 
@@ -1490,18 +1419,6 @@ msgstr "Type:"
 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"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurationsv�rkt�j for evolutions kalenderkomponent.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1512,49 +1429,11 @@ msgstr "Fejl under kommunikation med kalendertjeneren"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke l�se pilotens kalenderapplikationsblok"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Konfigur�r GnomeCal-komponent"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Gnome kalender"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Konfigur�r Udst�ende"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Udst�ende"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution opgaveliste-komponent"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurationsv�rkt�j for evolutions opgavelistekomponent.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
-#: 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�mindelse om din aftale "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Uds�t"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
 #: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Fil ikke fundet"
@@ -1567,75 +1446,114 @@ msgstr "�bn kalender"
 msgid "Save calendar"
 msgstr "Gem kalender"
 
-#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalender-visning. Tjek venligst din ops�tning af ORBit og "
 "OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: 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"
-msgstr "%a %Y-%m-%d"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-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:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y-%m-%d %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "H�j"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Lav"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Uigennemsigtig"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "Under udarbejdelse"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Fuldf�rt"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Afbrudt"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %Y-%m-%d %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1646,36 +1564,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: 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"
-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:895
-msgid "%I:%M:%S %p%n"
-msgstr " "
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-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:902
-msgid "%I:%M %p%n"
-msgstr " "
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1685,32 +1591,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 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:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten skal v�re mellem 0 og 9, inklusive"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Udefineret"
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nej"
 
@@ -1750,6 +1662,41 @@ msgstr "Indl�ser kalender"
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "P�mindelse om din aftale "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Uds�t"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Kan ikke initiere Evolutions composer."
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Kunne ikke initiere Gnome"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Kunne ikke oprette midlertidig katalog: %s"
+
 #: 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"
@@ -1818,7 +1765,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pip n�r alarmvinduet kommer til syne."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -1847,7 +1794,7 @@ msgid "Display options"
 msgstr "Vis valgmuligheder"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "F�rdig-dato"
 
@@ -1868,7 +1815,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "fredag"
 
@@ -1897,7 +1844,7 @@ msgid "Mon"
 msgstr "man"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "mandag"
 
@@ -1914,8 +1861,7 @@ msgid "Pick a color"
 msgstr "V�lg en farve"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1933,7 +1879,7 @@ msgid "Sat"
 msgstr "l�r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "l�rdag"
 
@@ -1958,7 +1904,7 @@ msgid "Sun"
 msgstr "s�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "s�ndag"
 
@@ -1971,7 +1917,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -1992,7 +1938,7 @@ msgid "Tue"
 msgstr "tir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "tirsdag"
 
@@ -2005,7 +1951,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -2058,20 +2004,12 @@ msgstr "�nsker du at gemme �ndringer?"
 msgid "% Comp_lete:"
 msgstr "% f�rdi_g:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Afbrudt"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Fuldf�rt"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
@@ -2081,22 +2019,6 @@ msgstr "Dato & tidspunkt"
 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"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Ikke startet"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2128,10 +2050,6 @@ msgstr "Opgave"
 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
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2158,91 +2076,147 @@ msgstr "_Status:"
 msgid "Edit Task"
 msgstr "Redig�r opgave"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Kategorier"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "F�rdigg�relsesdato"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Slutdato"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
 msgstr "Procent f�rdig"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URI"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Mark�r opgaven som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Slet denne opgave"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Slet opgaven"
 
@@ -2253,68 +2227,72 @@ 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Ny aftale..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Planl�g m�de"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Redig�r denne aftale..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "�bn"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Slet denne aftale"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Planl�g m�de"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "G�r denne aftale flytbar"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Slet denne opf�ring"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Slet alle opf�ringer"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2411,8 +2389,7 @@ msgstr "Indl�ser kalender..."
 msgid "Organizer:"
 msgstr "Arrang�r:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Afsender"
 
@@ -2503,26 +2480,26 @@ msgid ""
 "Time"
 msgstr "Planl�g m�de"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indl�se opgaverne i '%s'"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, 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"
@@ -2534,6 +2511,11 @@ msgstr "Metoden der kr�ves for at indl�se '%s' er ikke underst�ttet"
 msgid "%d %B"
 msgstr "%d %b"
 
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Slet alle opf�ringer"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "Varer he_le dagen"
@@ -2567,7 +2549,7 @@ msgid "No recurrence"
 msgstr "Ingen genindtr�ffelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "Afspil lyd/sang"
 
@@ -2588,21 +2570,21 @@ msgid "Reminder"
 msgstr "P�mindelse"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "K�_r program"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "Send besked"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "Vis dialog"
 
@@ -2622,14 +2604,12 @@ msgstr "_Start-tid:"
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "f�r"
 
@@ -2654,128 +2634,120 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "etiket21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minut(ter)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "m�ned(er)"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "uge(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "�r"
 
-#: calendar/gui/event-editor.c:369
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/event-editor.c:447
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:599
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:752
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "h�ndelser"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
 
-#: calendar/gui/event-editor.c:1521
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1523
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1526
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1531
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1533
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1538
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/event-editor.c:1543
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr " f�r begyndelse p� aftale"
 
-#: calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr " efter begyndelse p� aftale"
 
-#: calendar/gui/event-editor.c:1600
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr " f�r slutning p� aftale"
 
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr " efter slutning p� aftale"
 
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -2811,12 +2783,12 @@ msgstr ""
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2877,199 +2849,197 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikke initiere Gnome"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "s�n"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "man"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "tir"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "ons"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "tor"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "fre"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "l�r"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Opgaver"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Denne uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Denne m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Dette �r (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1237
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
@@ -3077,6 +3047,34 @@ msgstr "Forh�ndsvisning af udskrift"
 msgid "The URI of the tasks folder to display"
 msgstr "URI for opgavemappen der skal vises"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
@@ -3096,30 +3094,30 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3199,46 +3197,168 @@ msgstr "Movemail-programmet mislykkedes: %s"
 msgid "(Unknown error)"
 msgstr "(Ukendt fejl)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke indl�se %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke indl�se %s: Ingen initieringskode i modulet."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Forbindelse annuleret"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Handling annuleret"
 
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "Tjeneren godtog ikke brugernavn"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autentisering"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Fejl ved indl�sning af filter information:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "Kalenderinformation"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Dette lader dig koble til SMTP-serveren ved at bruge CRAM-MD5autenticering."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
+"klartekst-adgangskode."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Svar fra IMAP-tjener indeholdt ikke %s-information"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Serversvar afsluttet for tidligt."
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Dette lader dig koble til IMAP-tjeneren ved at bruge Kerberos 4 som "
+"autenticering."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kunne ikke f� fat p� Kerberos billet:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr "Forkert autoriseringsbesked fra server."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
+"klartekst-adgangskode."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3277,12 +3397,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For l�sning af e-post som en anmodning p� et andet s�t af mapper"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilg�ngelig for protokol `%s'"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3291,33 +3411,32 @@ msgstr ""
 "Kan ikke oprette katalog %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Opgave"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-streng `%s' indeholder ikke protokol"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-streng `%s' indeholder en ugyldig protokol"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kunne ikke f� fat p� Kerberos billet:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Forkert autoriseringsbesked fra server."
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Ingen s�dan besked"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3369,29 +3488,46 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For l�sning og gemning af e-post p� IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "For l�sning og gemning af e-post p� IMAP-tjenere."
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
 "klartekst-adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Dette lader dig koble til IMAP-tjeneren ved at bruge Kerberos 4 som "
-"autenticering."
+"Kunne ikke koble til POP-tjeneren.\n"
+"Ingen st�tte for forespurgt autenticeringsmekanisme."
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Ingen autentisering kr�vet"
 
-#: camel/providers/imap/camel-imap-store.c:369
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:397
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3402,7 +3538,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:674
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
@@ -3638,7 +3774,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lave oversigt over folder: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
@@ -3808,7 +3944,21 @@ msgstr ""
 "For tilkobling til POP-tjenere. POP-protokollen kan ogs� bruges for at hente "
 "e-post fra visse e-postudbydere via web, samt fra propriet�re e-postsystemer."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"For tilkobling til POP-tjenere. POP-protokollen kan ogs� bruges for at hente "
+"e-post fra visse e-postudbydere via web, samt fra propriet�re e-postsystemer."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3817,7 +3967,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativ som er underst�ttet af mange "
 "POP-tjenere."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -3827,29 +3977,29 @@ msgstr ""
 "adgangskode via APOP-protokollen. Dette vil muligvis ikke virke for alle "
 "brugere selv p� tjenere som h�vder at underst�tte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dette lader dig koble til POP-tjeneren ved at bruge Kerberos 4 som "
 "autenticering."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autenticere mod KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3858,12 +4008,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Ukendt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3871,7 +4021,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen st�tte for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3880,13 +4030,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3928,15 +4078,20 @@ msgstr "Kunne ikke udf�re %s: besked ikke sendt."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail afsluttede med status %d: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3944,96 +4099,137 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Kommando ikke implimenteret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Hj�lpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Tjeneste parat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Ingen adgangskode oplyst."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Kunne ikke koble til POP-tjeneren.\n"
+"Ingen st�tte for forespurgt autenticeringsmekanisme."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Ingen autentisering kr�vet"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Ingen autentisering kr�vet"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Velkomst fejl ved svar: %s: formentlig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Ingen autentisering kr�vet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4042,106 +4238,106 @@ msgstr ""
 "for autentificering. Dette burde virke for opkobling til de fleste "
 "SMTP-servere."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Dette lader dig koble til SMTP-serveren ved at bruge CRAM-MD5autenticering."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levering af e-post via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO fejl ved svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "RSET-anmodning overskred tid: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Forkert autoriseringsbesked fra server."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA sending overskred tid: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA fejl ved svar: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-anmodning overskred tid: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET fejl ved svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT fejl ved svar: %s: ikke-fatal"
@@ -4180,11 +4376,6 @@ msgstr "bilag"
 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
-msgid "Remove"
-msgstr "Fjern"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte punkter fra bilagslisten"
@@ -4198,6 +4389,7 @@ msgid "Attach a file to the message"
 msgstr "Vedh�ft bilag til meddelelsen"
 
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr ""
 
@@ -4221,40 +4413,52 @@ msgstr "MIME-type:"
 msgid "Send as:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Klik her for adressebogen"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klik her for adressebogen"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Svar-til:"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Indtast identiteten du �nsker at bruge ved sending af denne besked"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerne for meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4262,15 +4466,7 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af meddelelsen uden at komme til "
 "syne i meddelelsens modtagerliste."
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Indtast emnet for meddelelsen"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4279,26 +4475,26 @@ msgstr ""
 "Kunne ikke �bne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl ved gemning af fil: %s"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl ved indl�sning af fil: %s"
 
-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4308,27 +4504,27 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: composer/e-msg-composer.c:822
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Den fil eksisterer ikke."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Dette er ikke en almindelig fil."
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Den fil eksisterer men kan ikke l�ses."
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Den fil s� ud til at v�re tilg�ngelig, men open(2) fejlede."
 
-#: composer/e-msg-composer.c:1000
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4336,22 +4532,33 @@ msgstr ""
 "Filen er meget stor (mere end 100 k).\n"
 "Er du sikker p� at du �nsker at inds�tte den?"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "En fejl skete ved l�sning af filen."
 
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Skriv en meddelelse"
 
-#: composer/e-msg-composer.c:1580
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Kan ikke oprette komponeringsvinduet."
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evolution bj�lke_genvej"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "Adressekort"
@@ -4360,6 +4567,56 @@ msgstr "Adressekort"
 msgid "calendar information"
 msgstr "Kalenderinformation"
 
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%Y-%m-%d"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr " "
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr " "
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %Y-%m-%d"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %Y-%m-%d %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %Y-%m-%d %I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -4631,38 +4888,20 @@ msgstr "nu"
 msgid "<click here to select a date>"
 msgstr "<klik her for at v�lge en mappe>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Tilf�j filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redig�r filterregel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "indkommende"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "udg�ende"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redig�r filtre"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "S�"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Tilf�j handling"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Fjern handling"
 
@@ -4674,7 +4913,7 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specific�r en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -4699,35 +4938,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
@@ -4735,8 +4974,8 @@ msgstr "Fjern kriterie"
 msgid "Replied to"
 msgstr "Svaret til"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Vigtig"
@@ -4745,14 +4984,14 @@ msgstr "Vigtig"
 msgid "Read"
 msgstr "L�st"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Redig�r filtre"
+
 #: 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"
@@ -4761,368 +5000,327 @@ msgstr "Indkommende"
 msgid "Outgoing"
 msgstr "Udg�ende"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Visuelle mapper"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Angivet mappe blev ikke fundet"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "VMappe-kilder"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Besvaret"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Giv farve"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Giv point"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "bilag"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopi�r til mappe"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Slettet"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Udkast"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "lyder ikke som"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Afslut"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "M�rket"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Videresend til adresse"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "er st�rre end"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Diskussionsliste"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Beskeden blev modtaget"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Beskeden blev sendt"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "p� eller efter"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "p� eller f�r"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Passer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "L�st"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "S�t flag"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "_S�t Status"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Kilde"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "starter med"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "indeholder ikke"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "lyder ikke som"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "er st�rre end"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "er mindre end"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "p� eller efter"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "p� eller f�r"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "var f�r"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Tilf�j regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Redig�r skoringsregel"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Tilf�j regel for VMapper"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redig�r VMappe-regel"
-
-#: mail/component-factory.c:302
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Gem s�gning som vFolder"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Krop eller emne indeholder"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Kroppen indeholder"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Emnet indeholder"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Krop indeholder ikke"
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaber"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Emne indeholder ikke"
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Egenskaber"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr ""
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr "Gem s�gning som vFolder"
 
-#: mail/folder-browser.c:665
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VMappe for emne"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VMappe for afsender"
 
-#: mail/folder-browser.c:667
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VMappe for modtagere"
 
-#: mail/folder-browser.c:668 mail/folder-browser.c:786
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtr�r efter epostliste"
 
-#: mail/folder-browser.c:670
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtr�r efter emne"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtr�r efter afsender"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtr�r efter modtager"
 
-#: mail/folder-browser.c:673 mail/folder-browser.c:785
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtr�r efter epostliste"
 
-#: mail/folder-browser.c:679 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "�bn"
-
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: mail/folder-browser.c:682 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Udskriv"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Svar til afsender"
 
-#: mail/folder-browser.c:685 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:686 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:687 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Videresend mellem linjerne"
 
-#: mail/folder-browser.c:689
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "M�rk�r som _l�st"
 
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "M�rk�r som ul�st"
 
-#: mail/folder-browser.c:692
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: mail/folder-browser.c:693
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopi�r til mappe..."
 
-#: mail/folder-browser.c:695
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Fortryd sletning"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:699
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:701
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Skab regel fra besked"
 
-#: mail/folder-browser.c:788
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r efter epostliste (%s)"
 
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:705
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtr�r efter epostliste (%s)"
@@ -5164,22 +5362,6 @@ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Nuv�rende gemningsformat:"
@@ -5211,15 +5393,6 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Ingen"
-
 #: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr ""
@@ -5237,17 +5410,22 @@ msgstr "Er du sikker p� at du vil slette denne nyhedskonto?"
 msgid "Evolution Account Manager"
 msgstr "Evolution kontobehandler"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 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:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Udefineret"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5263,12 +5441,16 @@ msgstr "Emne er %s"
 msgid "Mail from %s"
 msgstr "Epost fra %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s diskussionsliste"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Tilf�j filterregel"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5280,7 +5462,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5288,7 +5470,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "f�r du kan sende epost."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5296,11 +5478,11 @@ msgstr ""
 "Du skal konfigurere en epost-transport\n"
 "f�r du kan sende epost."
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5308,32 +5490,32 @@ msgstr ""
 "Denne meddelse har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-callbacks.c:292
+#: mail/mail-callbacks.c:294
 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:314
+#: mail/mail-callbacks.c:316
 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:577
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
 
-#: mail/mail-callbacks.c:735
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-callbacks.c:820
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:822
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopi�r meddelelse(r) til"
 
-#: mail/mail-callbacks.c:957
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5341,11 +5523,11 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5353,15 +5535,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:1038
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1040
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5370,11 +5552,11 @@ msgstr ""
 "Fejl ved indl�sning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1197
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
@@ -5390,31 +5572,27 @@ msgstr "kontoinformation"
 msgid "Account Management"
 msgstr "Kontoadministration"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Egenskaber for konto"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Autentiseringtype:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automatisk tjek post hver"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Tjek indstillinger"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5427,191 +5605,189 @@ msgstr ""
 "Klik \"Fuldf�r\" for at gemme dine nye indstillinger"
 
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Gjort"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-postadresse:"
-
-#: mail/mail-config.glade.h:25
 msgid "Email Address:"
 msgstr "Epostadresse:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Email address:"
+msgstr "Epostadresse:"
+
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Konfiguration af Evolution epost"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Fulde navn:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "V�rtsnavn:"
 
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identitet"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
+msgid "Include this account when receiving mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Server for indkommende post"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Behold post p� tjener"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Epostkonto"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Konfiguration af epost"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Konfigurationguide for epost"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "G�r dette til min standardkonto"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr ""
 
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Forskelligt"
-
-#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "Nyheder"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Alternativ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Tjener for udg�ende post"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "PGP-kryptering"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Almindelig tekst"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Husk min adgangskode"
 
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Svar-til:"
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Hjemmeside-adresse:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "N�dvendigt"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "V�lg PGP bin�r"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "V�lg signaturfil"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Konfiguration af tjener"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Server kr�ver autentificering"
 
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Tjenere"
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Denne server kr�ver en sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid "Transport"
 msgstr "Transport"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Autentisering"
+
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5619,37 +5795,43 @@ msgstr ""
 "Indtast navnet som du �nsker at bruge for disse servere. For eksempel: 'job' "
 "eller 'hjemme'."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Brugerinformation"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Redig�r"
+
 #: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minutter."
 
-#: mail/mail-config-druid.c:401
+#: mail/mail-config-druid.c:421
 #, 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:495
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr ""
 
-#: mail/mail-config-druid.c:683
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5657,7 +5839,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1042
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution konto-troldmand"
 
@@ -5701,91 +5883,96 @@ msgstr "Skjul"
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Indl�ser indholdet af beskeden"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Klik p� ikonen for at dekryptere."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig p� netsted \"%s\""
 
-#: mail/mail-format.c:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:456
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Ingen s�dan mappe `%s'."
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "�bner '%s'"
 
-#: mail/mail-local.c:738
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:742
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "�ndr mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:766
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "_Rekonfigur�r mappe"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:795
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:827
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "�ndrer navn p� gammel mappe og gen�bner"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Opretter en ny mappe"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopierer beskeder"
 
-#: mail/mail-local.c:880
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5794,7 +5981,7 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s"
 
-#: mail/mail-local.c:919
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5802,25 +5989,29 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-mt.c:137
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:139
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-mt.c:707
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr ""
 
@@ -5833,75 +6024,75 @@ msgstr "Sender '%s'"
 msgid "Sending message"
 msgstr "Sender meddelelse"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Gemmer besked i mappe"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter meddelelser til %s"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopi�rer"
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s besked %d af %d (bruger-id \"%s\")"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1176
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "T�mmer mappe for slettede beskeder"
 
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1479
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1489
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter besked nummer %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5910,12 +6101,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gemmer besked %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5924,18 +6115,18 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1786
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
@@ -5944,35 +6135,35 @@ msgstr "Kan ikke skrive data: %s"
 msgid "_Search"
 msgstr ""
 
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr ""
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr ""
 
-#: mail/mail-send-recv.c:484
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr ""
 
@@ -5980,60 +6171,67 @@ msgstr ""
 msgid "Incomplete message written on pipe!"
 msgstr "Ufuldst�ndig meddelse skrevet til r�r!"
 
-#: mail/mail-tools.c:146
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke oprette midlertidig mbox '%s': %s"
 
-#: mail/mail-tools.c:199
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt meddelelse)"
 
-#: mail/mail-tools.c:209
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uden emne)"
 
-#: mail/mail-tools.c:226
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt meddelelse - %s"
 
-#: mail/mail-tools.c:228
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt meddelelse (intet emne)"
 
-#: mail/mail-vfolder.c:170
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr ""
+
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VMapper"
 
-#: mail/mail-vfolder.c:321
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 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 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 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 ui/evolution-mail.xml.h:41
 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 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Videresend denne meddelelse"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 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 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Slet denne meddelelse"
 
@@ -6041,6 +6239,14 @@ msgstr "Slet denne meddelelse"
 msgid "Unseen"
 msgstr "Ul�st"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "L�st"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Besvaret"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr ""
@@ -6088,6 +6294,10 @@ msgstr "%a %Y-%m-%d %H:%M:%S"
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "M�rket"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Afsender"
@@ -6436,7 +6646,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal gemning -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6522,13 +6732,13 @@ msgstr "Fjern denne genvej fra genvejsbj�lken"
 msgid "Error saving shortcuts."
 msgstr "Fejl under gemning af genveje."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vis"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
@@ -6584,26 +6794,25 @@ msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 msgid "The Evolution shell."
 msgstr "Evolution-skallen."
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hejsa. Tak for at du har taget tid til at hente denne smugkigsudgave \n"
 "af gruppevare-samlingen Evolution.\n"
@@ -6623,7 +6832,7 @@ msgstr ""
 "Vi h�ber du vil nyde resultaterne af vores h�rde arbejde, og vi\n"
 "venter ivrigt p� dine bidrag!\n"
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6631,15 +6840,15 @@ msgstr ""
 "Tak\n"
 "Holdet bag Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution-skallen."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Deaktiveret."
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
 
@@ -6663,40 +6872,53 @@ msgstr "Find kontakt"
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Udskriv kontakt"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Stop indl�sning"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Vis alle"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Konfiguration af _adressebog..."
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Kilder til adressebog"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Udskriv kontakter..."
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Kontakter..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Udskriv..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_S�g efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_V�rkt�j"
 
@@ -6708,117 +6930,119 @@ msgstr "Fem dage"
 msgid "Alter preferences"
 msgstr "�ndr ops�tning"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "_Kalender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Ops�tning af kalender"
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Opret en ny kalender"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "G� til"
+
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "G� tilbage i tiden"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "G� fremad i tid"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "G� til"
-
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "G� til specifik dato"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "G� til nutiden"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "M�ned"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr ""
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
+msgstr "Ny aftale..."
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "N�ste"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Smugkig"
 
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Udskriv kalender"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Gem som"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Gem kalender som noget andet"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Vis �n dag"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Vis �n m�ned"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Vis �n uge"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "I dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Uge"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Aftale"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "_�bn kalender"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Udskriv denne kalender"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Gem som..."
 
@@ -6844,7 +7068,7 @@ msgid "Print this item"
 msgstr "Udskriv denne ting"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Udskriv..."
 
@@ -6876,17 +7100,13 @@ msgid "Send _message to contact..."
 msgstr "Ny _meddelelse til kontaktperson"
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Udskriv..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Gem"
@@ -6935,7 +7155,7 @@ msgstr "Luk denne aftale"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopi�r til mappe... (RET)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopi�r"
@@ -6952,6 +7172,10 @@ msgstr "Klip ud"
 msgid "Cut the selection"
 msgstr "Klip valget ud"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Slet denne aftale"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "Dump XML"
@@ -7020,12 +7244,8 @@ msgstr "Skriverops_�tning..."
 msgid "Print Setup"
 msgstr "Skriverops�tning"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaber"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Gem"
 
@@ -7038,10 +7258,6 @@ msgstr "Gem aftalen og luk dialogboksen"
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Planl�g m�de"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "_Planl�g m�de"
@@ -7066,18 +7282,18 @@ msgstr "Redig�r sideindstillinger for aktiv skriver"
 msgid "Task _Request (FIXME)"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "L_uk"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (RET)"
 
@@ -7085,19 +7301,13 @@ msgstr "_Kontakt (RET)"
 msgid "_Copy"
 msgstr "_Kopi�r"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Fejls�g"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Redig�r"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -7134,7 +7344,8 @@ msgstr "_Inds�t"
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
@@ -7171,206 +7382,262 @@ msgstr "Indstillinger for Ledelsesresum�..."
 msgid "New Mail"
 msgstr "Nyt post"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Skriv en ny meddelelse"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kopi�r meddelelse til en ny mappe"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Mapper"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Skab regel fra besked"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtr�r _efter afsender"
+msgid "Display all of the message headers"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtr�r efter mod_tager"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Redig�r opgave"
 
 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filtr�r efter afsender"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filtr�r efter modtager"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filtr�r efter emne"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskoder"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Hent post"
-
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgte beskeder"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slettede beskeder"
+#, fuzzy
+msgid "Forward As"
+msgstr "Videresend"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skjul _l�ste beskeder"
+#, fuzzy
+msgid "Full Headers"
+msgstr "Toptekst"
 
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Brev_filtre..."
+msgid "Hide S_elected Messages"
+msgstr "Skjul valgte beskeder"
 
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Behandl abonnementer..."
+msgid "Hide _Deleted Messages"
+msgstr "Skjul slettede beskeder"
 
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "M�rk som _l�st"
+msgid "Hide _Read messages"
+msgstr "Skjul _l�ste beskeder"
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "M�rk som _ul�st"
+#, fuzzy
+msgid "Inline"
+msgstr "Vis i brev"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Flyt"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Behandl abonnementer..."
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Flyt meddelelsen til en ny mappe"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "M�rk�r som _l�st"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "M�rk�r som _l�st"
+
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "M�rk�r som ul�st"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Vis udskrift af besked..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Beskedskrop"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Udskriv besked til printeren"
+msgid "Move"
+msgstr "Flyt"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Udskriv besked..."
+msgid "Move message to a new folder"
+msgstr "Flyt meddelelsen til en ny mappe"
 
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+msgid "Print message to the printer"
+msgstr "Udskriv besked til printeren"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Svar til _afsender"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Bem�rkning"
 
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Svar til _alle"
+
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "Kilde"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "V�lg _alle"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "V�lg _alle"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "Send besked"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Afsend k�et post og modtag ny post"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Vis _alle beskeder"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Vis alt"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Tr�det meddelelsesliste"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VMappe for _afsender"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VMappe for _modtagere"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "VMappe for emne"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Vis r� beskedskildetekst"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Redigering af _virtuelle mapper..."
+
+#: ui/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Actions"
+msgstr "Ha_ndlinger"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Anvend filtre"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Konfigur�r folder..."
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Skriv"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopi�r til mappe..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Redig�r besked"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Skab regel fra besked"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_T�m skr�ldespand"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtr�r efter emne"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "Brev_filtre..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Mapper"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_vers�r udvalg"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Konfiguration af epost..."
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Afsend besked"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Ops�tning"
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Besked"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Flyt til mappe..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_�bn i nyt vindue"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Udskriv besked"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Gem besked som..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "Send besked"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Tr�det"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Fortryd sletning"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMappe for emne"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering af _virtuelle mapper..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedh�ft"
@@ -7476,15 +7743,56 @@ msgstr "Vis bilag"
 msgid "Sign this message with your PGP key"
 msgstr "Underskriver denne besked med din PGP-n�gle"
 
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Sl� visning af mappelinjen til/fra"
+
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Sl� visning af mappelinjen til/fra"
+
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Sl� visning af mappelinjen til/fra"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Insert"
+msgstr "_Indeks"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Inds�t tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_�bn..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Svar-til:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Sikkerhed"
 
@@ -7492,6 +7800,10 @@ msgstr "_Sikkerhed"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Tilf�j mappe p� listen over abonnerede mapper"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Mapper"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "L�s listen igen"
@@ -7572,7 +7884,7 @@ msgstr "Fortryd"
 msgid "Undo the last action"
 msgstr "Fortryd sidste handling"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "_Aftale (RET)"
 
@@ -7589,8 +7901,9 @@ msgid "Create a new task"
 msgstr "Opret ny opgave"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Ny"
+#, fuzzy
+msgid "New Task"
+msgstr "Opgave"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7600,6 +7913,11 @@ msgstr ""
 msgid "Tasks Preferences..."
 msgstr "Ops�tning af opgaver..."
 
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Opgave"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -7609,8 +7927,9 @@ msgid "Close this window"
 msgstr "Luk dette vindue"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Personific�r..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Personific�r v�rkt�jslinjer"
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7633,96 +7952,96 @@ msgid "Evolution bar _shortcut"
 msgstr "Evolution bj�lke_genvej"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Afslut"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "Kom _i gang"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Den centrale v�rkt�jslinje"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Vis oplysninger om Evolution"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Vis mappe_bj�lken"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Vis genvejsbj�lken"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "Indsend _fejlrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Indsend fejlrapport med Fejl-Frede."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� visning af mappelinjen til/fra"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� visning af genvejslinjen til/fra"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Bruger behandleren af kontakter"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Brug af kalenderen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Brug af postdelen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Arbejder"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Mapper"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Import�r fil..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Afsend besked"
 
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Ny VMappe"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Ops�tning"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Skjul genvejsbj�lken"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -7803,6 +8122,11 @@ msgstr "Tid for m�dets slutning:"
 msgid "All Attendees"
 msgstr "Alle deltagere"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "den aktuelle tid"
+
 #. 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
@@ -7814,26 +8138,68 @@ msgstr "mtotfls"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "nu"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: 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.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
 #: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr " "
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr " "
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "S�g"
+
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Avanceret"
+
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Avanceret..."
+
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Information"
@@ -7855,7 +8221,7 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:135
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "_S�g"
 
@@ -7883,7 +8249,253 @@ msgstr "Kunne ikke initiere Gnome"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution bj�lke_genvej"
+#~ msgid "Disabled"
+#~ msgstr "Deaktiveret"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synkronis�r"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopi�r fra Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopi�r til Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Flet fra Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Flet til Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevar <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Oprindelig forfatter:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <eskil@eazel.com>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolution adressebogs-komponent"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "� 1998-2000 the Free Software Foundation og Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Konfigurationsv�rkt�j for evolutions adressebogskomponent.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Synkroniseringshandling"
+
+#~ msgid "Conduit state"
+#~ msgstr "Komponent-tilstand"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Ingen pilot er konfigureret, v�lg venligst\n"
+#~ "kappleten 'Egenskaber for pilot link' f�rst."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Ikke tilkoblet gnome-pilot d�mon"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "En fejl opstod under fors�g p� at hente\n"
+#~ "pilot-listen fra gnome-pilot d�monen"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Konfigur�r Udst�ende"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Udst�ende"
+
+#~ msgid "label26"
+#~ msgstr "etiket26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution kalender-komponent"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Konfigurationsv�rkt�j for evolutions kalenderkomponent.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Konfigur�r GnomeCal-komponent"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Gnome kalender"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Konfigur�r Udst�ende"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Udst�ende"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution opgaveliste-komponent"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Konfigurationsv�rkt�j for evolutions opgavelistekomponent.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "Prioriteten skal v�re mellem 0 og 9, inklusive"
+
+#~ msgid "Schedule meeting"
+#~ msgstr "Planl�g m�de"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Redig�r denne aftale..."
+
+#~ msgid "label21"
+#~ msgstr "etiket21"
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Indtast identiteten du �nsker at bruge ved sending af denne besked"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Indtast emnet for meddelelsen"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Redig�r filterregel"
+
+#~ msgid "incoming"
+#~ msgstr "indkommende"
+
+#~ msgid "outgoing"
+#~ msgstr "udg�ende"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "Draft"
+#~ msgstr "Udkast"
+
+#~ msgid "Set Flag"
+#~ msgstr "S�t flag"
+
+#~ msgid "Add Rule"
+#~ msgstr "Tilf�j regel"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Tilf�j regel for VMapper"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Redig�r VMappe-regel"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Krop eller emne indeholder"
+
+#~ msgid "Body contains"
+#~ msgstr "Kroppen indeholder"
+
+#~ msgid "Subject contains"
+#~ msgstr "Emnet indeholder"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Krop indeholder ikke"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne indeholder ikke"
+
+#~ msgid "Account Properties"
+#~ msgstr "Egenskaber for konto"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server for indkommende post"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskelligt"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Tjener for udg�ende post"
+
+#~ msgid "Servers"
+#~ msgstr "Tjenere"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Konfiguration af _adressebog..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Udskriv kontakter..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "_Kalender"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Ops�tning af kalender"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Udskriv denne kalender"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filtr�r _efter afsender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtr�r efter mod_tager"
+
+#~ msgid "Get Mail"
+#~ msgstr "Hent post"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "M�rk som _l�st"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "M�rk som _ul�st"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Vis udskrift af besked..."
+
+#~ msgid "Print message..."
+#~ msgstr "Udskriv besked..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til _afsender"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Vis _alle beskeder"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Konfigur�r folder..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Redig�r besked"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtr�r efter emne"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Konfiguration af epost..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_�bn i nyt vindue"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Udskriv besked"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gem besked som..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VMappe for emne"
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "Personific�r..."
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Vis mappe_bj�lken"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Vis genvejsbj�lken"
diff --git a/po/es.po b/po/es.po
index 70d1853443..fe24907509 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-03-11 17:28+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -320,125 +320,6 @@ msgstr "Importa archivos de GnomeCard a Evolution."
 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar desde Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mezclar desde Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mezclar al Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor Original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Enlace con el libro de direcciones de Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Utilidad de configuraci�n del enlace del calendario de evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Acci�n de sincronizaci�n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado del enlace"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"No hay ning�n pilot configurado, por favor seleccione primero\n"
-"el capplet 'Propiedades del enlace con Pilot'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "No hay conexi�n con el demonio gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Se ha producido un error cuando se intentaba\n"
-"obtener del demonio gnome-pilot la lista del pilot"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "No pude cargar el cursor\n"
@@ -464,14 +345,6 @@ msgstr "No se puede inicializar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de direcciones del pilot"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configura el enlace del libro de direcciones"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Enlace del libro de direcciones de Evolution"
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -534,7 +407,7 @@ msgid "Phone Types"
 msgstr "Tipos de tel�fono"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
 
@@ -573,7 +446,7 @@ msgstr "_Compa��a:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
 #: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -625,113 +498,132 @@ msgstr "Es_t� es la direcci�n de correo"
 msgid "Delete Contact?"
 msgstr "�Borrar contacto?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto est� en estas categor�as:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "M�vil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Correo electr�nico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Correo electr�nico 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Editar filtros"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Nombre completo:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Correo electr�nico"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Direcci�n _2:"
@@ -928,7 +820,7 @@ msgid "None (anonymous mode)"
 msgstr "Ninguno (modo an�nimo)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -1059,7 +951,7 @@ msgstr "Fuentes de la agenda de direcciones"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1081,6 +973,12 @@ msgstr "Nombre"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Otros contactos"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for displaying an address."
 msgstr "Un control Bonobo para mostrar una direcci�n."
@@ -1125,6 +1023,21 @@ msgstr "Interfaz de Evoluti�n de selecci�n de nombre de la agenda."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Buscar..."
@@ -1501,19 +1414,6 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Ancho:"
 
-#: 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 "Enlace con el Calendario de Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-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:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1524,30 +1424,6 @@ msgstr "Error mientras me comunicaba con el servidor de calendario"
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de calendario del pilot"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configurar el enlace con GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Enlace con el calendario de Evolution"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configurar el enlace con el componente `Por Hacer'"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Enlace con el componente `Por Hacer' de Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Enlace Por Hacer de Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-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:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
@@ -1587,7 +1463,7 @@ msgstr "Confidencial"
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1977,8 +1853,7 @@ msgid "Pick a color"
 msgstr "Elije un color"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -2380,7 +2255,7 @@ msgid "New Appointment..."
 msgstr "Nueva Cita..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
@@ -2500,8 +2375,7 @@ msgstr "Cargando calendario..."
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Remitente"
 
@@ -2593,8 +2467,8 @@ msgstr ""
 "Concertar\n"
 "Hora"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Estado"
 
@@ -2716,14 +2590,12 @@ msgstr "Hora de _inicio:"
 msgid "_Starting date:"
 msgstr "Fecha de Ini_cio:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "despu�s de"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "antes"
 
@@ -2748,34 +2620,26 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "hasta"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "a�o(s)"
 
@@ -3159,9 +3023,9 @@ msgstr "A�o actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -3224,9 +3088,9 @@ msgstr "Error ejecutando filtro: %s: %s"
 #: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Error ejecutando la b�squeda del filtro: %s"
+msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3235,7 +3099,7 @@ msgstr ""
 "No puedo parsear la expresi�n de b�squeda %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3244,16 +3108,16 @@ msgstr ""
 "Error ejecutando la b�squeda seg�n la expresi�n %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(concordar todas) requiere un �nico resultado booleano"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando b�squeda en cabezera desconocida: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido en el contenido del cuerpo, esperando una cadena"
 
@@ -3333,47 +3197,47 @@ msgstr "El programa Movemail ha fallado: %s"
 msgid "(Unknown error)"
 msgstr "(Error desconocido)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No puedo cargar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "No pude cagar %s: No hay c�digo de inicializaci�n en el m�dulo."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor se desconect� inesperadamente"
 
@@ -3476,7 +3340,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaci�n err�nea desde el servidor."
 
@@ -3530,12 +3394,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una b�squeda de otras carpetas"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3544,6 +3408,13 @@ msgstr ""
 "No puedo crear el directorio %s:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Tarea"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3559,7 +3430,7 @@ msgstr "La URL `%s' contiene un protocolo no v�lido"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "El n�mero del puerto en la URL `%s' no es num�rico"
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
@@ -3614,32 +3485,42 @@ 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:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Para leer y guardar correo en los servidores IMAP."
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:407
+#: camel/providers/imap/camel-imap-store.c:415
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticaci�n %s"
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3650,7 +3531,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
@@ -3886,7 +3767,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "No puedo resumir la carpeta: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1313
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4054,6 +3935,20 @@ msgstr ""
 "Para conectar con servidores POP. El protocolo POP tambi�n puede usarse para "
 "recoger correo de algunos web-mail y sistemas de correo propietarios."
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Para conectar con servidores POP. El protocolo POP tambi�n puede usarse para "
+"recoger correo de algunos web-mail y sistemas de correo propietarios."
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -4124,7 +4019,7 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
@@ -4175,11 +4070,11 @@ msgstr "sendmail finalizo con estado %d: correo no enviado."
 msgid "Could not find 'From' address in message"
 msgstr "No pude encontrar la direcci�n 'De' en el mensaje"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Env�o de correo v�a el programa sendmail"
 
@@ -4191,123 +4086,134 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conect�ndose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr "Para enviar correo conect�ndose a un servidor de correo usando SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los par�metros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Par�metro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviar� a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Acci�n solicitada del correo no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acci�n solicitada no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Acci�n solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Acci�n solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acci�n solicitada no realizada: excedi� la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acci�n solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Fallo en la transacci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr "Es necesaria una transici�n de contrase�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr "El m�todo de autenticaci�n en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encriptaci�n requerida por el mecanismo de autenticaci�n pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Mensaje de bienvenida err�neo: %s: posiblemente no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "No se requiere autentificaci�n:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4315,108 +4221,108 @@ msgstr ""
 "Esta opci�n es para conectar con servidores SMTP sin usar autentificaci�n. "
 "Esto deber�a ser suficiente para la mayor�a de los servidores SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Env�o de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no v�lida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Expir� el tiempo para HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, 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:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expir� el tiempo para el env�o de DATA: terminaci�n del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, 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:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -4455,11 +4361,6 @@ msgstr "adjunto"
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: 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
-msgid "Remove"
-msgstr "Quitar"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
@@ -4509,33 +4410,40 @@ msgid "From:"
 msgstr "De:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Responder a:"
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibir�n una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4566,12 +4474,12 @@ msgstr "Error guardando el archivo: %s"
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4581,27 +4489,27 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4609,15 +4517,15 @@ msgstr ""
 "El archivo es muy largo (m�s de 100K).\n"
 "�Esta seguro que quiere a�adirlo?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se le�a el archivo."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -4633,6 +4541,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "La herramienta de trabajo en grupo Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "tarjeta de direcci�n"
@@ -4762,7 +4674,7 @@ msgstr "Mover %s a la fila anterior"
 #: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the next row"
-msgstr "Ir al siguiente elemento"
+msgstr "Mover %s a la fila siguiente"
 
 #: executive-summary/component/e-summary-url.c:80
 #, c-format
@@ -4967,29 +4879,20 @@ msgstr "ahora"
 msgid "<click here to select a date>"
 msgstr "<pinche aqu� para a�adir una fecha>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "A�adir Regla de Filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar regla de filtro"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Reglas para los filtro"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Entonces"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "A�adir acci�n"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Quitar acci�n"
 
@@ -5026,35 +4929,35 @@ msgstr ""
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Sin t�tulo"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "si se cumple alg�n criterio"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "A�adir criterio"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Quitar criterio"
 
@@ -5062,8 +4965,8 @@ msgstr "Quitar criterio"
 msgid "Replied to"
 msgstr "Respondido a"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Importante"
@@ -5072,14 +4975,14 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Le�do"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar filtros"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Editar carpeta virtual"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Reglas para los filtro"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Entrando"
@@ -5088,7 +4991,7 @@ msgstr "Entrando"
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Carpetas virtuales"
 
@@ -5112,238 +5015,197 @@ msgstr "con todas las carpetas locales y remotas activas"
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Contestado"
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Asignar color"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar puntuaci�n"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Adjunto"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Borrado"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Borrador"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "_Salir"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "existe"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Marcado"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Reenviar a direcci�n"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Se recibi� el mensaje"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Se envi� el mensaje"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "en o despu�s de"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "en o antes de"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Visto"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Poner marca"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Fuente"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "comienza por"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "concuerda con la expresi�n regular"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "en o despu�s de"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "en o antes de"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "estaba despu�s de"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "estaba antes de"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "A�adir regla"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Editar regla de puntuaci�n"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "A�adir regla para carpeta virtual"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Editar regla de VFolder"
-
-#: mail/component-factory.c:303
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-factory.c:213
+#: mail/folder-browser-factory.c:237
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propiedades"
@@ -5352,81 +5214,81 @@ msgstr "Propiedades"
 msgid "Store search as vFolder"
 msgstr "Guardar la b�squeda como una carpeta virtual"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VFolder seg�n el asunto"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VFolder seg�n el remitente"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VFolder seg�n los destinatarios"
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtrar seg�n el asunto"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtrar seg�n el remitente"
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtrar seg�n los destinatarios"
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtrar seg�n la lista de correo"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:30 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Marcar como le�do"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Marcar como no le�do"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Recuperar"
 
@@ -5434,20 +5296,20 @@ msgstr "Recuperar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Crear una regla con el mensaje"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
@@ -5484,22 +5346,6 @@ msgstr "Factor�a para el componente de correo de Evolution."
 msgid "Factory for the Mail Summary component."
 msgstr "Factor�a para el componente de Resumen de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factor�a para importar correos de Outlook Express 4 en Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Factor�a para importar mbox en Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importa archivos Outlook Express 4 en Evolution. "
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importa archivos mbox en Evolution. "
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamiento actual:"
@@ -5589,6 +5435,10 @@ msgstr "Correo de %s"
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "A�adir Regla de Filtro"
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5682,7 +5532,7 @@ msgstr "Guardar mensaje como..."
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5691,11 +5541,11 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
@@ -5950,7 +5800,7 @@ msgstr ""
 "Pulse \"Siguiente\" para comenzar. "
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "_Editar"
@@ -6026,10 +5876,6 @@ msgstr "Ocultar"
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr "Responder a:"
-
 #: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
@@ -6156,15 +6002,15 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-mt.c:666
+#: mail/mail-mt.c:666 mail/session.c:91
 msgid "Do you accept?"
 msgstr "�Acepta?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Progreso de Evolution"
 
@@ -6177,75 +6023,75 @@ msgstr "Enviando \"%s\""
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:852
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1070
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1111 mail/mail-ops.c:1249
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1178
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recogiendo mensaje %s"
 
-#: mail/mail-ops.c:1481
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Recogiendo mensajes"
 
-#: mail/mail-ops.c:1491
+#: mail/mail-ops.c:1506
 #, 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:1565
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1644
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6254,12 +6100,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6268,11 +6114,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6281,7 +6127,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1788
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
@@ -6368,23 +6214,23 @@ msgstr "Nueva carpeta virtual"
 
 #. 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 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
@@ -6396,6 +6242,14 @@ msgstr "Borrar este mensaje"
 msgid "Unseen"
 msgstr "Sin leer"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Visto"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Contestado"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
@@ -6443,6 +6297,10 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Marcado"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "De"
@@ -6810,7 +6668,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6897,7 +6755,7 @@ msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Ver"
@@ -6958,8 +6816,8 @@ msgstr "El tipo especificado no esta soportado por este manejador"
 msgid "The Evolution shell."
 msgstr "La shell de Evolution."
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6996,7 +6854,7 @@ msgstr ""
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
 "esperamos sus contribuci�nes\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7004,15 +6862,15 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "No puedo inicializar la shell de Evolution."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Deshabilitado."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -7037,7 +6895,7 @@ msgid "New contact"
 msgstr "Nuevo contacto"
 
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
@@ -7045,7 +6903,7 @@ msgstr "Ver el mensaje que va a ser impreso"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Parar"
 
@@ -7079,7 +6937,7 @@ msgid "_Search for contacts"
 msgstr "Bu_scar contactos"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:75
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Herramientas"
@@ -7199,7 +7057,7 @@ msgstr "_Nuevo"
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:72
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Guardar _como..."
@@ -7226,7 +7084,7 @@ msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:34 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimir..."
 
@@ -7259,13 +7117,13 @@ msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Archivo"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Guardar"
@@ -7404,7 +7262,7 @@ msgid "Print Setup"
 msgstr "Configurar impresi�n"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Guardar"
 
@@ -7441,12 +7299,12 @@ msgstr "Configurar los datos de la p�gina para la impresora actual"
 msgid "Task _Request (FIXME)"
 msgstr "Task _Request (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Cerrar"
@@ -7460,12 +7318,12 @@ msgstr "_Contact (FIXME)"
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "A_yuda"
@@ -7503,7 +7361,7 @@ msgstr "_Pegar"
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propiedades..."
@@ -7562,206 +7420,211 @@ msgid "Display all of the message headers"
 msgstr "Mostrar la cabecera de los mensajes"
 
 #: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Editar Tarea"
+
+#: ui/evolution-mail.xml.h:11
 msgid "Filter on Se_nder"
 msgstr "Filtrar seg�n el remite_nte"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:12
 msgid "Filter on _Recipients"
 msgstr "Filtrar seg�n los destinata_rios"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:13
 msgid "Filter on _Subject"
 msgstr "Filtrar seg�n el a_sunto"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Olvidar _contrase�a"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:16
 msgid "Forward As"
 msgstr "Reenviar como"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:18
 msgid "Full Headers"
 msgstr "Cabecera completa"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _le�dos"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 msgid "Inline"
 msgstr "Incluido"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Mark All as R_ead"
 msgstr "Marcar todos como l_e�dos"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Mark as U_nread"
 msgstr "Marcar como _no le�do"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Message _Display"
 msgstr "_Mostrar mensaje"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Mover mensaje a una nueva carpeta"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:36
 msgid "Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:37
 msgid "Redirect (FIXME: implement me)"
 msgstr "Redirigir (ARREGLAME: implementame)"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "F_uente"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:45
 msgid "Select _Thread"
 msgstr "Seleccionar _Hilo"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
 msgid "Send and Receive"
 msgstr "Enviar & Recibir"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:48
 msgid "Show _All"
 msgstr "Mostrar _todo"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VFolder seg�n el _remitente"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VFolder seg�n los _destinatarios"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "VFolder on _Subject"
 msgstr "VFolder seg�n el a_sunto"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Ver las fuentes del mensaje"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Compose"
 msgstr "_Componer"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:60
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:63
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selecci�n"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:67
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:68
 msgid "_Mail Settings..."
 msgstr "_Configuraci�n del correo..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:69
 msgid "_Message Hiding"
 msgstr "Ocultar _mensaje"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:71
 msgid "_Open Selected Items"
 msgstr "Abrir element_os seleccionados"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:74
 msgid "_Send and Receive"
 msgstr "_Enviar y Recibir"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Encadenados"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -7882,31 +7745,41 @@ msgstr "Activa si se muestra el campo CC"
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Activa si se muestra el campo CC"
+
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Abrir..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Responder a:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Seguridad"
 
@@ -8229,6 +8102,11 @@ msgstr "Hora de _fin de la reuni�n:"
 msgid "All Attendees"
 msgstr "Todos los participantes"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "Vista de la tarjeta"
+
 #. 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
@@ -8285,15 +8163,15 @@ msgstr "El tiempo es inv�lido"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "B�queda avanzada"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Avanzada..."
 
@@ -8342,6 +8220,140 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "La herramienta de trabajo en grupo Evolution"
+#~ msgid "Disabled"
+#~ msgstr "Deshabilitado"
+
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar desde Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar al Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mezclar desde Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mezclar al Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Autor Original:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Enlace con el libro de direcciones de Evolution"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Utilidad de configuraci�n del enlace del calendario de evolution.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Acci�n de sincronizaci�n"
+
+#~ msgid "Conduit state"
+#~ msgstr "Estado del enlace"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "No hay ning�n pilot configurado, por favor seleccione primero\n"
+#~ "el capplet 'Propiedades del enlace con Pilot'."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "No hay conexi�n con el demonio gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Se ha producido un error cuando se intentaba\n"
+#~ "obtener del demonio gnome-pilot la lista del pilot"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Configura el enlace del libro de direcciones"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Enlace del libro de direcciones de Evolution"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Enlace con el Calendario de Evolution"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr ""
+#~ "Utilidad de configuraci�n para el enlace <<calendario>> de evolution.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Configurar el enlace con GnomeCal"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Enlace con el calendario de Evolution"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Configurar el enlace con el componente `Por Hacer'"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Enlace con el componente `Por Hacer' de Evolution"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ 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"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Editar regla de filtro"
+
+#~ msgid "Deleted"
+#~ msgstr "Borrado"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Set Flag"
+#~ msgstr "Poner marca"
+
+#~ msgid "matches regex"
+#~ msgstr "concuerda con la expresi�n regular"
+
+#~ msgid "Add Rule"
+#~ msgstr "A�adir regla"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "A�adir regla para carpeta virtual"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Editar regla de VFolder"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Factor�a para importar correos de Outlook Express 4 en Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Factor�a para importar mbox en Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa archivos Outlook Express 4 en Evolution. "
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa archivos mbox en Evolution. "
diff --git a/po/fi.po b/po/fi.po
index 93e3362e2a..3b131b7eed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-03-12 22:44+0000\n"
+"POT-Creation-Date: 2001-03-15 11:18+0100\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"
@@ -279,121 +279,6 @@ msgstr ""
 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronoi"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopioi Pilotista"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopioi Pilotiin"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synkronoi toiminto"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Ei yhteytt� gnome-pilot -demoniin"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
@@ -419,14 +304,6 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr ""
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr ""
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -489,7 +366,7 @@ msgid "Phone Types"
 msgstr "Puhelintyypit"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Ensisijainen s�hk�posti"
 
@@ -580,113 +457,132 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Ty�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Ty� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "S�hk�posti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "S�hk�posti 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Muokkaa"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Koko nimi:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "S�hk�posti"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -874,7 +770,7 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -1004,7 +900,7 @@ msgstr "Osoitekirjan l�hteet"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1026,6 +922,12 @@ msgstr "Nimi"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Muut kontaktit"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for displaying an address."
 msgstr ""
@@ -1070,6 +972,21 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Etsi..."
@@ -1441,18 +1358,6 @@ msgstr "Tyyppi:"
 msgid "Width:"
 msgstr "Leveys:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1463,30 +1368,6 @@ msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr ""
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr ""
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
@@ -1526,7 +1407,7 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr ""
 
@@ -1912,8 +1793,7 @@ msgid "Pick a color"
 msgstr "Valitse v�ri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioriteetti"
 
@@ -2315,7 +2195,7 @@ msgid "New Appointment..."
 msgstr "Uusi tapaaminen..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Avaa"
@@ -2435,8 +2315,7 @@ msgstr "Ladataan kalenteria..."
 msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "L�hett�j�"
 
@@ -2522,8 +2401,8 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Tila"
 
@@ -2645,14 +2524,12 @@ msgstr "_Alkamisaika:"
 msgid "_Starting date:"
 msgstr "_Alkamisp�iv�:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "j�lkeen"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "ennen"
 
@@ -2677,34 +2554,26 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minuuttia"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "kuukautta"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "viikkoa"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "vuotta"
 
@@ -3088,7 +2957,7 @@ msgstr ""
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
 #: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
@@ -3145,30 +3014,30 @@ msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3248,47 +3117,47 @@ msgstr ""
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3377,7 +3246,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -3429,12 +3298,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3443,6 +3312,13 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Teht�v�"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3458,7 +3334,7 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr ""
@@ -3513,32 +3389,41 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:407
+#: camel/providers/imap/camel-imap-store.c:415
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3546,7 +3431,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
@@ -3769,7 +3654,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1317
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -3916,7 +3801,7 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:286
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Haetaan POP-viesti� %s"
+msgstr "Haetaan POP-viesti� %d"
 
 #: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
@@ -3933,6 +3818,17 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -3991,7 +3887,7 @@ msgid ""
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -4041,11 +3937,11 @@ msgstr ""
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
@@ -4057,225 +3953,235 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "V�liaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Todennusta ei vaadita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoitetta ei ole m��ritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 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:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 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:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -4314,11 +4220,6 @@ msgstr "liite"
 msgid "Attach a file"
 msgstr "Liit� tiedosto"
 
-#: 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
-msgid "Remove"
-msgstr "Poista"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr ""
@@ -4368,33 +4269,40 @@ msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr ""
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4421,12 +4329,12 @@ msgstr "Virhe tallennettaessa tiedostoa: %s"
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4436,27 +4344,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen ep�onnistui."
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4464,15 +4372,15 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liitt�� sen?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 
@@ -4486,6 +4394,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr ""
@@ -4804,29 +4716,20 @@ msgstr "nyt"
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Lis�� toiminto"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Poista toiminto"
 
@@ -4859,35 +4762,35 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "S��nn�n nimi: "
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Poista ehto"
 
@@ -4895,8 +4798,8 @@ msgstr "Poista ehto"
 msgid "Replied to"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
@@ -4905,12 +4808,12 @@ msgstr ""
 msgid "Read"
 msgstr "Lue"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
 msgstr ""
 
 #: filter/filter.glade.h:7
@@ -4921,7 +4824,7 @@ msgstr "Tulevat"
 msgid "Outgoing"
 msgstr "L�htev�t"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr ""
 
@@ -4945,238 +4848,195 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Liite"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "sis�lt��"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "L�hetetty"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Poistettu"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "ei sis�ll�"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Luonnos"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "_Poistu"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:21
+msgid "Expression"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "on suurempi kuin"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "on pienempi kuin"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Viesti l�hetetty"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Siirr� kansioon"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
+#: filter/libfilter-i18n.h:39
+msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "L�hde"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "sis�lt��"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "ei sis�ll�"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "on suurempi kuin"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "on pienempi kuin"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Lis�� s��nt�"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: filter/score-editor.c:126
+msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:303
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:214
+#: mail/folder-browser-factory.c:237
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:216 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr ""
@@ -5185,81 +5045,81 @@ msgstr ""
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Tallenna nimell�..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
 #: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Siirr� kansioon..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Palauta"
 
@@ -5267,20 +5127,20 @@ msgstr "Palauta"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5317,22 +5177,6 @@ msgstr ""
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -5416,6 +5260,10 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr ""
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5499,18 +5347,18 @@ msgstr "Tallenna viesti nimell�..."
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
@@ -5756,7 +5604,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -5828,10 +5676,6 @@ msgstr "Piilota"
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr ""
-
 #: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr ""
@@ -5948,15 +5792,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:666
+#: mail/mail-mt.c:666 mail/session.c:91
 msgid "Do you accept?"
 msgstr "Hyv�ksytk�?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr ""
 
@@ -6001,73 +5845,73 @@ msgstr ""
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1074
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1115 mail/mail-ops.c:1253
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1182
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1369
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1418
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1485
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Haetaan viestej�"
 
-#: mail/mail-ops.c:1495
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Tallennetaan viestej�"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1749
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1792
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
@@ -6180,6 +6024,14 @@ msgstr "Poista t�m� viesti"
 msgid "Unseen"
 msgstr ""
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr ""
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr ""
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr ""
@@ -6227,6 +6079,10 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr ""
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "L�hett�j�"
@@ -6556,7 +6412,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6639,7 +6495,7 @@ msgid "Error saving shortcuts."
 msgstr ""
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_N�yt�"
@@ -6700,8 +6556,8 @@ msgstr ""
 msgid "The Evolution shell."
 msgstr ""
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6721,7 +6577,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6729,15 +6585,15 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
@@ -6983,13 +6839,13 @@ msgid "Send _message to contact..."
 msgstr "L�het� _viesti kontaktille..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Tiedosto"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Tallenna"
@@ -7128,7 +6984,7 @@ msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Tallenna"
 
@@ -7165,12 +7021,12 @@ msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 msgid "Task _Request (FIXME)"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Sulje"
@@ -7184,12 +7040,12 @@ msgstr "_Kontakti"
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Apua"
@@ -7610,31 +7466,40 @@ msgstr ""
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Bcc Field"
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "Li_s��"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Liit� tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Avaa..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Vastaa l�hett�j�lle"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Turvallisuus"
 
@@ -7957,6 +7822,10 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+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
@@ -8013,15 +7882,15 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Edistynyt ..."
 
@@ -8070,6 +7939,44 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ei onnistunut"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#~ msgid "Synchronize"
+#~ msgstr "Synkronoi"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopioi Pilotista"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopioi Pilotiin"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Synkronoi toiminto"
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Ei yhteytt� gnome-pilot -demoniin"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Deleted"
+#~ msgstr "Poistettu"
+
+#~ msgid "Draft"
+#~ msgstr "Luonnos"
+
+#~ msgid "Add Rule"
+#~ msgstr "Lis�� s��nt�"
diff --git a/po/fr.po b/po/fr.po
index dd8d1de42e..56621ffe9a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,12 +3,10 @@
 # Vincent Renardias <vincent@debian.org>, 2000.
 # Christophe Merlet (RedFox) <redfox@eikonex.org>, 2000-2001.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-02-13 13:04+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-02-13 13:03+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -315,131 +313,13 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "D�sactiv�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchroniser"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copier depuis le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copier vers le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Fusionner depuis le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Fusionner vers le Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Auteur originel : "
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conduit 'Contact' d'Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 la Free Software Foundation et Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronise l'action"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "�tat du conduit"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Aucun Pilot configur�, choisissez la capplet\n"
-"'Propri�t�s du lien Pilot' en premier."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Non connect� au d�mon gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"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:201
 msgid "Cursor could not be loaded\n"
 msgstr "Le curseur ne peut �tre charg�\n"
@@ -465,19 +345,11 @@ msgstr "Ne peut d�marrer wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configuration du conduit Adresses"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Conduit Adresses"
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Ajouter"
 
@@ -518,7 +390,7 @@ msgstr "Classer comme :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "G�n�ral"
 
@@ -535,7 +407,7 @@ msgid "Phone Types"
 msgstr "Types de t�l�phones"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -548,6 +420,7 @@ msgid "Web page address:"
 msgstr "Page Web :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Ajouter"
 
@@ -572,8 +445,8 @@ msgid "_Company:"
 msgstr "So_ci�t� :"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -625,109 +498,133 @@ msgstr "_C'est l'adresse de la liste de diffusion"
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "�lement(s) appartenant � ces cat�gories : "
+
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 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:574
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Fax travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "R�pondeur"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 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:575
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 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:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Fax autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-mail 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "�diter les Filtres"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Nom complet :"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Adresse �lec."
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2 :"
@@ -842,25 +739,25 @@ msgstr "_Suffixe :"
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Comme _minicartes"
 
-#: addressbook/gui/component/addressbook.c:236
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Comme _tableau"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr "Entrer le mot de passe pour %s"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -880,27 +777,27 @@ msgstr ""
 "vous devriez t�l�charger et installer OpenLDAP, puis\n"
 "recompiler et installer Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Afficher tout"
 
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Avanc�e..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "L'e-mail contient"
 
-#: addressbook/gui/component/addressbook.c:738
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -925,9 +822,9 @@ msgid "None (anonymous mode)"
 msgstr "Aucun (mode anonyme)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -968,7 +865,7 @@ msgid "Remember this password"
 msgstr "Se souvenir de ce mot de passe"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "H�te :"
 
@@ -997,12 +894,12 @@ msgid "Search Scope:"
 msgstr "Domaine de recherche :"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Identification :"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Chemin :"
 
@@ -1031,7 +928,7 @@ msgstr ""
 "informations le concernant."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1056,21 +953,21 @@ msgstr "Sources du carnet d'adresses"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Supprimer"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "�diter"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Nom"
 
@@ -1078,34 +975,49 @@ msgstr "Nom"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Autres contacts"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 #, fuzzy
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Conduit 'Contact' d'Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Cliquez ici pour le carnet d'adresses"
@@ -1119,6 +1031,21 @@ msgstr "Conduit 'Contact' d'Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Rechercher..."
@@ -1247,64 +1174,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
 msgstr "Adresse �lec."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr "D�partement"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 #, fuzzy
 msgid "Click here to add a contact"
 msgstr "* Cliquez ici pour ajouter un contact *"
@@ -1313,7 +1240,7 @@ msgstr "* Cliquez ici pour ajouter un contact *"
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1327,6 +1254,11 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour cr�er un nouveau contact."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Carte : "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1484,7 +1416,7 @@ msgstr "Nom du style :"
 msgid "Top:"
 msgstr "Haut :"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Type :"
 
@@ -1492,19 +1424,6 @@ msgstr "Type :"
 msgid "Width:"
 msgstr "Largeur :"
 
-#: 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 "Conduite � Calendrier � d'Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
-"Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1515,59 +1434,20 @@ msgstr "Erreur lors de la communication avec le serveur de calendrier"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configuration du conduit calendrier"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Conduit Calendrier"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configuration du conduit `A Faire'"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Conduit Evolution `A Faire'"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Conduite � � faire � d'Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-"Utilitaire de configuration pour la conduite � � faire � d'Evolution.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application � � faire � du Pilot"
 
-#: 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 "Rappel de votre rendez-vous � "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sieste"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Valider"
-
-#: calendar/gui/calendar-commands.c:248
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: calendar/gui/calendar-commands.c:272
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Ouvrir le calendrier"
 
-#: calendar/gui/calendar-commands.c:314
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Enregistrer le calendrier"
 
@@ -1578,68 +1458,107 @@ msgstr ""
 "Ne peut cr�er la vue du calendrier. Veuillez v�rifier votre configuration "
 "d'ORBit et d'OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:337
-#: 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"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
-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:345 calendar/gui/calendar-model.c:774
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:385
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/calendar-model.c:476
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:476
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:478
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:478
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Haute"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Basse"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:553
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:779
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Non d�marr�e"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "En cours"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Compl�t�"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Annul�"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1650,36 +1569,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
-#: 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"
-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:898
-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:901
-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:905
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:908
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1689,43 +1596,73 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1013
 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:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Ind�fini"
+
 #: calendar/gui/calendar-model.c:1108
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "La priorit� doit �tre comprise entre 1 et 9 inclus"
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:197
+#: calendar/gui/calendar-model.c:1598
+#, fuzzy
+msgid "Recurring"
+msgstr "R�currence"
+
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Assigner un score"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "Maintenant"
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%A %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:438
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Erreur de chargement du calendrier</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 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:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "Affichage"
 
-#: calendar/gui/calendar-summary.c:625
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "Afficher les rendez-vous"
 
-#: calendar/gui/calendar-summary.c:633
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "Afficher les t�ches"
 
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Chargement du calendrier"
 
@@ -1733,6 +1670,41 @@ msgstr "Chargement du calendrier"
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Rappel de votre rendez-vous � "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Sieste"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Valider"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Ne peut initialiser GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
+
 #: 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"
@@ -1801,7 +1773,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Biper quand les fen�tres d'alarme apparaissent."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -1830,7 +1802,7 @@ msgid "Display options"
 msgstr "Options d'affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Date d'�ch�ance"
 
@@ -1851,7 +1823,7 @@ msgid "Fri"
 msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -1880,7 +1852,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Lundi"
 
@@ -1897,7 +1869,7 @@ msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Priorit�"
 
@@ -1915,7 +1887,7 @@ msgid "Sat"
 msgstr "Sam"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -1940,7 +1912,7 @@ msgid "Sun"
 msgstr "Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -1953,7 +1925,7 @@ msgid "Thu"
 msgstr "Jeu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -1974,7 +1946,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -1987,7 +1959,7 @@ msgid "Wed"
 msgstr "Mer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -2000,7 +1972,7 @@ msgid "minutes before they occur."
 msgstr "minutes avant leur d�but."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:84
 msgid "seconds."
 msgstr "secondes."
 
@@ -2040,20 +2012,12 @@ msgstr "Voulez-vous enregistrer les changements ?"
 msgid "% Comp_lete:"
 msgstr "% Comp_l�t� :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Annul�"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classification"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Compl�t�"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 #, fuzzy
@@ -2064,26 +2028,6 @@ msgstr "Date &amp; heure"
 msgid "Date Completed:"
 msgstr "Date d'ach�vement :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Haute"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "En cours"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Basse"
-
-#: 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 "Non d�marr�e"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2115,10 +2059,6 @@ msgstr "T�che"
 msgid "URL:"
 msgstr "URL :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Ind�fini"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2145,93 +2085,148 @@ msgstr "_�tat :"
 msgid "Edit Task"
 msgstr "�diter la t�che"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Aucun r�sum�"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "T�che - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entr�e de journal - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Cat�gories"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Date de fin"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Date de d�but"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Emplacement g�ographique"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent complete"
 msgstr "Marque la t�che comme compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "R�sum�"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Transparence"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Cliquez ici pour ajouter une t�che"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Marquer comme termin�e"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Marque la t�che comme compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "�diter cette t�che..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "�dite la t�che"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Supprimer la t�che"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Supprime la t�che"
 
@@ -2242,69 +2237,73 @@ 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "Nouveau rendez-vous..."
-
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
 #, fuzzy
-msgid "Schedule meeting"
-msgstr "S�lectionnez un Dossier"
+msgid "New Appointment..."
+msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "�diter ce rendez-vous..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Ouvrir"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "S�lectionnez un Dossier"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Rendre ce rendez-vous d�pla�able"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Supprimer toutes les occurences"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2408,7 +2407,7 @@ msgstr "Chargement du calendrier"
 msgid "Organizer:"
 msgstr "Organisation :"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Exp�diteur"
 
@@ -2504,26 +2503,26 @@ msgid ""
 "Time"
 msgstr "S�lectionnez un Dossier"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1157
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "�tat"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Tous"
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Cat�gorie :"
 
-#: calendar/gui/e-tasks.c:284
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger la t�che dans � %s �"
 
-#: calendar/gui/e-tasks.c:296
+#: calendar/gui/e-tasks.c:309
 #, 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"
@@ -2535,6 +2534,11 @@ msgstr "La m�thode requise pour charger � %s � n'est pas support�e"
 msgid "%d %B"
 msgstr "%d %B"
 
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Supprimer toutes les occurences"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Toute la journ�e"
@@ -2568,7 +2572,7 @@ msgid "No recurrence"
 msgstr "Aucune r�currence"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr ""
 
@@ -2589,22 +2593,22 @@ msgid "Reminder"
 msgstr "Alarme"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "Lancer un programme"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 #, fuzzy
 msgid "Send an email"
 msgstr "R�cup�ration du courrier depuis %s"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "R�glages..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "Afficher un dialogue"
 
@@ -2624,11 +2628,12 @@ msgstr "Heure de _d�but :"
 msgid "_Starting date:"
 msgstr "Date de _d�but :"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "apr�s"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "avant"
 
@@ -2654,178 +2659,170 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mois"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 #, fuzzy
 msgid "start of appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "jusqu'�"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "semaine(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "ann�e(s)"
 
-#: calendar/gui/event-editor.c:369
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/event-editor.c:447
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/event-editor.c:599
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "dans le"
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "i�me"
 
-#: calendar/gui/event-editor.c:752
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "occurences"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 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:1521
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr " %d jours"
 
-#: calendar/gui/event-editor.c:1523
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr " 1 jour"
 
-#: calendar/gui/event-editor.c:1526
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr " %d semaines"
 
-#: calendar/gui/event-editor.c:1528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr " 1 semaine"
 
-#: calendar/gui/event-editor.c:1531
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr " %d heures"
 
-#: calendar/gui/event-editor.c:1533
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr " 1 heure"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutes"
 
-#: calendar/gui/event-editor.c:1538
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr " 1 minute"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr " %d secondes"
 
-#: calendar/gui/event-editor.c:1543
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1601
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:1600
+#: calendar/gui/event-editor.c:1611
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Me rappeler de tous les rendez-vous"
 
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Conduite � Calendrier � d'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Evolution calendar component."
 msgstr ""
 "Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans � %s �"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, 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"
@@ -2886,199 +2883,197 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2�me"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3�me"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4�me"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9�me"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14�me"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19�me"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24�me"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31�me"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "T�ches"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Jour en cours (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semaine en cours (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Mois en cours (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Ann�e en cours (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Aper�u Avant Impression"
 
@@ -3087,26 +3082,54 @@ msgstr "Aper�u Avant Impression"
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-filter-driver.c:767
+#: camel/camel-filter-driver.c:790
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-driver.c:772
+#: camel/camel-filter-driver.c:795
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3115,7 +3138,7 @@ msgstr ""
 "Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3124,16 +3147,16 @@ msgstr ""
 "Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:547
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3215,46 +3238,169 @@ msgstr "�chec du programme movemail : %s"
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne peut charger %s : %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 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:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Connexion annul�e"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(h�te inconnu)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Op�ration annul�e"
 
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "Serveur d�connect�."
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Identification"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Erreur de chargement des information du filtre :\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "Information utilisateur"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Cela vous connectera au serveur SMTP en utilisant une identification "
+"CRAM-MD5."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
+"en clair."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "La r�ponse du serveur IMAP ne contient pas l'information %s"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "La r�ponse du serveur s'est termin�e trop tot."
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Cette option vous connectera au serveur IMAP en utilisant Kerberos 4 pour "
+"vous identifier."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Ne peut obtenir le ticket Kerberos :\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr "Mauvaise r�ponse d'identification du serveur."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
+"en clair."
+
 #: camel/camel-search-private.c:105
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3285,12 +3431,21 @@ 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:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "Founisseur de dossier de courrier virtuel"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+"Pour la lecture de courrier comme requ�te a un autre ensemble de dossiers"
+
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole � %s �"
 
-#: camel/camel-session.c:394
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3299,33 +3454,32 @@ msgstr ""
 "Ne peut cr�er le r�pertoire %s :\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "T�che"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La cha�ne d'URL � %s � ne contient pas de protocole"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La cha�ne d'URL � %s � contient un protocole invalide"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Le num�ro de port dans l'URL � %s � n'est pas num�rique"
 
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ne peut obtenir le ticket Kerberos :\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Mauvaise r�ponse d'identification du serveur."
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Aucun message correspondant"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3337,7 +3491,7 @@ msgstr "R�ponse innatendue du serveur IMAP : %s"
 msgid "IMAP command failed: %s"
 msgstr "�chec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -3355,13 +3509,18 @@ msgstr "La r�ponse du serveur IMAP ne contient pas l'information %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�ponse OK innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Scrutation des dossiers dans � %s �"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la r�ponse FETCH."
 
@@ -3373,29 +3532,46 @@ 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-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
+
+#: camel/providers/imap/camel-imap-store.c:263
 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
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:261
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Cette option vous connectera au serveur IMAP en utilisant Kerberos 4 pour "
-"vous identifier."
+"Impossible de se connecter au serveur POP.\n"
+"Aucun support pour le m�canisme d'identification demand�."
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Aucune identification requise"
 
-#: camel/providers/imap/camel-imap-store.c:367
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:395
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3406,7 +3582,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:672
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut cr�er le r�pertoire %s : %s"
@@ -3471,12 +3647,12 @@ msgstr "Fichier de courrier local %s"
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:281
+#: camel/providers/local/camel-local-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossible de supprimer le fichier de r�sum� de dossier � %s � : %s"
 
-#: camel/providers/local/camel-local-store.c:290
+#: camel/providers/local/camel-local-store.c:292
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier � %s � : %s"
@@ -3651,7 +3827,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne peut r�sumer le dossier : %s :%s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1346
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synchronisation du dossier"
 
@@ -3826,7 +4002,22 @@ msgstr ""
 "pour r�cup�rer les courriers depuis certains fournisseurs de courriers Web "
 "et de syst�mes de courriers propri�taires."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Pour la connexion aux serveurs POP. Le protocole POP peut aussi �tre utilis� "
+"pour r�cup�rer les courriers depuis certains fournisseurs de courriers Web "
+"et de syst�mes de courriers propri�taires."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3834,7 +4025,7 @@ msgstr ""
 "Cette option vous connectera au serveur POP en utilisant un mot de passe en "
 "clair. C'est la seul option support� par la plupart des serveurs POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -3844,29 +4035,29 @@ msgstr ""
 "chiffr� via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs m�me si le serveur pr�tend pouvoir le supporter."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Ne peut vous identifier sur le serveur KPOP : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Ne peut se connecter au serveur POP sur %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3875,12 +4066,12 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du nom d'utilisateur : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3888,7 +4079,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le m�canisme d'identification demand�."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3897,7 +4088,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier � %s �."
@@ -3945,15 +4136,20 @@ msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail s'est terrmin� avec l'�tat %d : courrier non envoy�."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Ne peut trouver le corps du message dans la r�ponse FETCH."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3964,96 +4160,140 @@ msgstr ""
 "Pour livrer le courrier en vous connectant � un distributeur distant "
 "utilisant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"Pour livrer le courrier en vous connectant � un distributeur distant "
+"utilisant SMTP."
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Commande non impl�ment�e"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Service pret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "�chec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Aucun mot de passe fournit."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Impossible de se connecter au serveur POP.\n"
+"Aucun support pour le m�canisme d'identification demand�."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Aucune identification requise"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Aucune identification requise"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenur : %s : s�rement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4061,127 +4301,112 @@ msgstr ""
 "Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
 "Cela devrait �tre suffisant pour se connecter � la plupart des serveurs SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Cela vous connectera au serveur SMTP en utilisant une identification "
-"CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas d�fini"
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas valide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Ne peut ex�cuter %s : courrier non envoy�."
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Mauvaise r�ponse d'identification du serveur."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, fuzzy, c-format
 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:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Aucun message correspondant"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Founisseur de dossier de courrier virtuel"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-"Pour la lecture de courrier comme requ�te a un autre ensemble de dossiers"
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 octet"
@@ -4216,11 +4441,6 @@ msgstr "pi�ce-jointe"
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: 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
-msgid "Remove"
-msgstr "Enlever"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les �l�ments s�lectionn�s de la liste des pi�ces-jointes"
@@ -4233,7 +4453,8 @@ msgstr "Ajouter une pi�ce-jointe..."
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1157
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Pi�ce-jointe"
 
@@ -4257,40 +4478,52 @@ msgstr "Type MIME :"
 msgid "Send as:"
 msgstr "Envoyer comme :"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "De :"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Cliquez ici pour le carnet d'adresses"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "R�pondre-� :"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Entrez l'identit� sous laquelle vous d�sirez envoyer ce message"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "� :"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 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:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4298,15 +4531,7 @@ 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:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Sujet :"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Entrez le sujet du message"
-
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4315,39 +4540,26 @@ msgstr ""
 "Ne peut ouvrir le fichier de signature %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Enregistrement des changements dans le message..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Enregistrer les changements dans le message..."
-
-#: composer/e-msg-composer.c:761
-#, 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:819 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4357,27 +4569,27 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Ce fichier n'existe pas."
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Ce n'est pas un fichier normal."
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Ce fichier existe mais n'est pas lisible."
 
-#: composer/e-msg-composer.c:1006
+#: composer/e-msg-composer.c:1005
 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:1028
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4385,23 +4597,33 @@ 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:1049
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Ne peut cr�er la fen�tre de composition."
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "La suite de travail collaboratif Evolution"
+
 #: data/evolution.keys.in.h:1
 #, fuzzy
 msgid "address card"
@@ -4412,6 +4634,56 @@ msgstr "Adresse"
 msgid "calendar information"
 msgstr "Information utilisateur"
 
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%m/%d/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %m/%d/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -4421,12 +4693,12 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
 
-#: executive-summary/component/component-factory.c:159
+#: 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."
 
-#: executive-summary/component/e-summary-callbacks.c:285
+#: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
 "Summary.\n"
@@ -4434,64 +4706,64 @@ msgid ""
 "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
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:62
+#: executive-summary/component/e-summary-url.c:70
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:63
+#: executive-summary/component/e-summary-url.c:71
 #, 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
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Change the view to %s"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:65
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Run %s"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:67
+#: executive-summary/component/e-summary-url.c:75
 #, c-format
 msgid "Close %s"
 msgstr "Fermer %s"
 
-#: executive-summary/component/e-summary-url.c:68
+#: executive-summary/component/e-summary-url.c:76
 #, fuzzy, c-format
 msgid "Move %s to the left"
 msgstr "D�placer vers le dossier"
 
-#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the right"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:78
 #, fuzzy, c-format
 msgid "Move %s into the previous row"
 msgstr "Va � la date actuelle"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:79
 #, fuzzy, c-format
 msgid "Move %s into the next row"
 msgstr "Va � la date actuelle"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:80
 #, fuzzy, c-format
 msgid "Configure %s"
 msgstr "_Configuration du dossier..."
 
-#: executive-summary/component/e-summary.c:916
+#: executive-summary/component/e-summary.c:918
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4500,14 +4772,14 @@ msgstr ""
 "Ne peut ouvrir le fichier %s :\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:930
+#: executive-summary/component/e-summary.c:932
 #, fuzzy, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr "Erreur de lecture du fichier de courrier : %s"
 
-#: executive-summary/component/e-summary.c:948
+#: executive-summary/component/e-summary.c:950
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4519,7 +4791,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:59
+#: executive-summary/component/main.c:60
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
@@ -4553,13 +4825,32 @@ msgstr ""
 msgid "Test service"
 msgstr "Ajouter un service"
 
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
 #: widgets/misc/e-messagebox.c:155
 msgid "Error"
 msgstr "Erreur"
 
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+#, fuzzy
+msgid "Update now"
+msgstr "Mettre � jour le calendrier"
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update every "
+msgstr "_Mettre � jour Libre/Occup�"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minutes"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "an"
@@ -4600,10 +4891,6 @@ msgstr "heures"
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutes"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "seconde"
@@ -4673,38 +4960,20 @@ msgstr "maintenant"
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour s�lectionner une date>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Ajouter une R�gle de Filtre"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "�diter la R�gle du Filtre"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "entrant"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "sortant"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "�diter les Filtres"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "R�gles de Filtrage"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Ajouter l'action"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Supprimer l'action"
 
@@ -4714,7 +4983,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "S�lectionnez un Dossier"
 
@@ -4739,35 +5008,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Nom de la r�gle : "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Ex�cuter les actions"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "si tous les crit�res sont remplis"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "si un des crit�res est rempli"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Ajouter un crit�re"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Supprimer le crit�re"
 
@@ -4775,8 +5044,8 @@ msgstr "Supprimer le crit�re"
 msgid "Replied to"
 msgstr "R�pondu �"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Important"
@@ -4785,14 +5054,14 @@ msgstr "Important"
 msgid "Read"
 msgstr "Lu"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "�diter les Filtres"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "�diter les dossiers virtuels"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "R�gles de Filtrage"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Entrant"
@@ -4801,316 +5070,334 @@ msgstr "Entrant"
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "Sources de Dossier Virtuel"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Enregistre le dossier local"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assigner une couleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigner un score"
 
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copier vers le dossier"
-
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Date de r�ception"
+#, fuzzy
+msgid "Attachments"
+msgstr "Pi�ce-jointe"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Date d'envoi"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contient"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expression"
+msgid "Copy to Folder"
+msgstr "Copier vers le dossier"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Fait suivre � l'adresse"
+msgid "Date received"
+msgstr "Date de r�ception"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corps du message"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "En-t�te du message"
+msgid "Date sent"
+msgstr "Date d'envoi"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Le message a �t� re�u"
+msgid "does not contain"
+msgstr "ne contient pas"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Le message a �t� envoy�"
+msgid "does not end with"
+msgstr "ne fini pas avec"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "D�placer vers le dossier"
+msgid "does not exist"
+msgstr "n'existe pas"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinataires"
+msgid "does not sound like"
+msgstr "ne ressemble pas"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+msgid "does not start with"
+msgstr "ne commence pas par"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1157
-msgid "Score"
-msgstr "Score"
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "fini avec"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "D�finir l'�tat"
+#, fuzzy
+msgid "Exist"
+msgstr "Quitter"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Source"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "En-t�te sp�cifique"
+msgid "Expression"
+msgstr "Expression"
+
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "Fait suivre � l'adresse"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Arr�te le traitement"
+msgid "is"
+msgstr "est"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1158
-msgid "Subject"
-msgstr "Sujet"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "est plus que"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "est moins que"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "n'est pas"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contient"
+#, fuzzy
+msgid "Mailing list"
+msgstr "liste de diffusion %s"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ne contient pas"
+msgid "Message Body"
+msgstr "Corps du message"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "ne fini pas avec"
+msgid "Message Header"
+msgstr "En-t�te du message"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "n'existe pas"
+msgid "Message was received"
+msgstr "Le message a �t� re�u"
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ne ressemble pas"
+msgid "Message was sent"
+msgstr "Le message a �t� envoy�"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "ne commence pas par"
+msgid "Move to Folder"
+msgstr "D�placer vers le dossier"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "fini avec"
+msgid "on or after"
+msgstr "sur ou apr�s"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "on or before"
+msgstr "sur ou avant"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "est plus que"
+msgid "Recipients"
+msgstr "Destinataires"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "est moins que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "n'est pas"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "est"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Score"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "sur ou apr�s"
+msgid "Set Status"
+msgstr "D�finir l'�tat"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "sur ou avant"
-
-#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "ressemble �"
 
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
+msgstr "Source"
+
 #: filter/libfilter-i18n.h:42
+msgid "Specific header"
+msgstr "En-t�te sp�cifique"
+
+#: filter/libfilter-i18n.h:43
 msgid "starts with"
 msgstr "D�bute avec"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr "Arr�te le traitement"
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Sujet"
+
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "�tait apr�s"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "�tait avant"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Ajouter une r�gle"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "�diter la r�gle de score"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Ajouter une r�gle de dossier virtuel"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "�ditez la r�gle du dossier virtuel"
-
-#: mail/component-factory.c:297
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:323
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "S�lectionnez un Dossier"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Le corps ou le sujet contient"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Le corps contient"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Le sujet contient"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Le corps ne contient pas"
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Le sujet ne contient pas"
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:244
+#: mail/folder-browser.c:219
 #, fuzzy
-msgid "Sender contains"
-msgstr "Le nom contient"
+msgid "Store search as vFolder"
+msgstr "S�lectionnez un Dossier"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:657
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "Dossier virtuel sur l'exp�diteur"
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "Dossier virtuel sur les destinataires"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:661
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtre sur l'exp�diteur"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ouvrir"
-
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimer"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "R�pondre � l'exp�diteur"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "R�pondre � tous"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Faire suire incorpor�"
 
-#: mail/folder-browser.c:679
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:682
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "D�placer vers le dossier..."
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
-#: mail/folder-browser.c:685
+#: mail/folder-browser.c:573
 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:689
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
+#: mail/folder-browser.c:705
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Filtre sur la liste de diffusion (%s)"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr ""
@@ -5149,22 +5436,6 @@ msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
@@ -5198,36 +5469,42 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Aucune"
-
-#: mail/mail-accounts.c:115
+#: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (d�faut)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "�tes-vous s�r de vouloir supprimer cette t�che sans titre %s ?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "�tes-vous s�r de vouloir supprimer ce rendez-vous sans titre ?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr "Gestionnaire de comptes Evolution"
 
-#: mail/mail-account-editor.c:286
+#: mail/mail-account-editor.c:307
 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:646
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conduit '� faire' d'Evolution"
 
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Ind�fini"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5243,12 +5520,16 @@ msgstr "Sujet est %s"
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Ajouter une R�gle de Filtre"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5260,7 +5541,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5268,7 +5549,7 @@ msgstr ""
 "Vous devez configurer une identit�\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5276,11 +5557,11 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 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:223
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5288,33 +5569,33 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr "Vous devez configurer un compte avant de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:316
 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:571
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Le %s, %s a �crit :\n"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:814
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5322,11 +5603,11 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "�craser le fichier ?"
 
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5334,15 +5615,15 @@ msgstr ""
 "Un fichier avec le m�me nom existe.\n"
 "L'�craser ?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:1140
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5351,22 +5632,14 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "�chec de l'impression du message"
 
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "Connexion au serveur"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "Connecter au serveur"
-
 #: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Compte"
@@ -5379,31 +5652,27 @@ msgstr "Information du compte"
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propri�t�s du compte"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Avanc�e"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "V�rifier les r�glages"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -5417,44 +5686,46 @@ msgstr ""
 "Cliquez sur \"Terminer\" pour enregistrer vos nouveaux param�tres."
 
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "D�faut"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Fait"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+msgid "Email Address:"
 msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
 msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Configuration de la messagerie Evolution"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Nom d'h�te :"
 
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identit�"
 
 #: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Serveur de courrier entrant"
+msgid "Include this account when receiving mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
 msgid "Keep mail on server"
@@ -5489,54 +5760,57 @@ msgstr ""
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marque les messages comme vus [ms] : "
 
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Optionnel"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Serveur de courrier sortant"
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "PGP binary path:"
+msgstr "Encrypter avec PGP"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Texte plein"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Se souvenir de mon mot de passe"
 
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "R�pondre-� :"
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Requis"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Select PGP binary"
+msgstr "S�lectionner un fichier"
+
 #: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "S�lectionner un fichier de signature"
@@ -5563,8 +5837,9 @@ msgid "Server requires authentication"
 msgstr "Le serveur n�cessite une identification"
 
 #: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Serveurs"
+#, fuzzy
+msgid "Server type:"
+msgstr "Type de serveur : "
 
 #: mail/mail-config.glade.h:66
 msgid "Signature file:"
@@ -5574,19 +5849,29 @@ msgstr "Fichier de signature :"
 msgid "Signature:"
 msgstr "Signature :"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Ce serveur n�cessite une connexion s�curis� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Transparent"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Identification"
+
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5594,15 +5879,15 @@ msgstr ""
 "Tapez le nom sous lequel vous voulez identifier ces serveurs. Par exemple : "
 "� Travail � ou � Maison �."
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Information utilisateur"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -5610,22 +5895,28 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "Configuration de la messagerie Evolution"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_�dition"
+
+#: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minutes."
 
-#: mail/mail-config-druid.c:399
+#: mail/mail-config-druid.c:421
 #, 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:489
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Espace de nom :"
 
-#: mail/mail-config-druid.c:677
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5633,7 +5924,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1036
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
@@ -5677,106 +5968,99 @@ msgstr "Cacher"
 msgid "%s attachment"
 msgstr "pi�ce-jointe %s"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 #, fuzzy
 msgid "Loading message content"
 msgstr "Contenu de message invalide"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�diter le message"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1611
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1623
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1693
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:1661
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1666
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:399
-msgid "Registering local folder"
-msgstr "Enregistrement du dossier local"
-
-#: mail/mail-local.c:401
-msgid "Register local folder"
-msgstr "Enregistre le dossier local"
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Aucun dossier � %s �."
 
 #: mail/mail-local.c:508
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Ne peut enregistrer le dossier � %s � :\n"
-"%s"
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Ouvrir dans %s..."
 
-#: mail/mail-local.c:672
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Change de dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:736
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Fermeture du dossier en cours"
 
-#: mail/mail-local.c:768
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Renommage du vieus dossier et ouverture"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Cr�ation d'un nouveau dossier"
 
-#: mail/mail-local.c:800
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Copie du message"
 
-#: mail/mail-local.c:821
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5785,7 +6069,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:852
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5793,7 +6077,7 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette bo�te aux lettres, alors\n"
 "vous aurez besoin de la r�parer manuellement."
 
-#: mail/mail-mt.c:88
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5802,7 +6086,7 @@ msgstr ""
 "Erreur durant � %s � :\n"
 "%s"
 
-#: mail/mail-mt.c:90
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5811,117 +6095,98 @@ msgstr ""
 "Erreur durant l'ex�cution de l'op�ration :\n"
 "%s"
 
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:519
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
+
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:518
 msgid "Sending message"
 msgstr "Envoie du message"
 
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Adjation de � %s �"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Adjoint un message sans sujet"
-
-#: mail/mail-ops.c:842
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "D�placement des messages de � %s � vers � %s �"
-
-#: mail/mail-ops.c:844
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Duplication des messages de � %s � vers � %s �"
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:847
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "D�place les messages de � %s � vers � %s �"
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-ops.c:849
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copie les messages de � %s � vers � %s �"
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Copie du message"
 
-#: mail/mail-ops.c:880
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "D�placement"
 
-#: mail/mail-ops.c:883
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s message %d de %d (uid � %s �)"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans � %s �"
 
-#: mail/mail-ops.c:1044 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Aucune description)"
-
-#: mail/mail-ops.c:1109
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1150 mail/mail-ops.c:1284
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1215
+#: mail/mail-ops.c:1193
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1396
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1445
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "R�cup�ration du message %s"
 
-#: mail/mail-ops.c:1512
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "R�cup�ration des messages"
 
-#: mail/mail-ops.c:1522
+#: mail/mail-ops.c:1506
 #, 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:1672
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Chargement de %s dossier pour %s"
-
-#: mail/mail-ops.c:1674
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Charge %s dossier pour %s"
-
-#: mail/mail-ops.c:1840
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5930,12 +6195,12 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1932
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Enregistrement du message %d sur %d (uid � %s �)"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5944,12 +6209,12 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:1760
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Enregistrer la pi�ce-jointe"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5958,7 +6223,7 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2063
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut �crire les donn�es : %s"
@@ -5968,306 +6233,255 @@ msgstr "Ne peut �crire les donn�es : %s"
 msgid "_Search"
 msgstr "Rechercher"
 
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 #, fuzzy
 msgid "Receiving"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:304
 #, fuzzy
 msgid "Sending"
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-send-recv.c:483
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "Annul�."
 
-#: mail/mail-send-recv.c:487
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "Compl�t�."
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
+#: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "Message incompl� �crit dans le conduit !"
 
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Erreur durant le pr�paration vers %s :\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Erreur durant � %s � :\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Erreur de lecture des commandes de l'enfilade envoy�."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Message corrompu de l'enfilade envoy�e ?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Ne peut cr�er la bo�te de dialogue"
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "L'utilisateur a annul� la requ�te"
-
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut cr�er de mbox temporaire � %s � : %s"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (message suivi)"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (pas de sujet)"
 
-#: mail/mail-tools.c:283
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:285
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Message suivi (pas de sujet)"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Ne peut ouvrir l'emplacement � %s � :\n"
-"%s"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:303
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "R�pondre"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "R�pond � l'exp�diteur du message"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 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 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Fait suivre le message"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Imprime le message s�lectionn�"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Supprime le message"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr "R�pondu"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:620
+#: mail/message-list.c:630
 msgid "Multiple Messages"
 msgstr "Messages multiple"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:952
 #, 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:950 mail/message-list.c:966
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et tous"
 
-#: mail/message-list.c:953 mail/message-list.c:969
+#: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1028
+#: mail/message-list.c:1042
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:1037
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:1049
+#: mail/message-list.c:1063
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1057
+#: mail/message-list.c:1071
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1059
+#: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1157
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1158
+#: mail/message-list.c:1172
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:1158
+#: mail/message-list.c:1172
 msgid "Date"
 msgstr "Date"
 
-#: mail/message-list.c:1158
+#: mail/message-list.c:1172
 msgid "Received"
 msgstr "R��u"
 
-#: mail/message-list.c:1159
+#: mail/message-list.c:1173
 msgid "To"
 msgstr "�"
 
-#: mail/message-list.c:1159
+#: mail/message-list.c:1173
 msgid "Size"
 msgstr "Taille"
 
-#: mail/openpgp-utils.c:77
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Veuillez saisir votre %s phrase de passe pour %s"
 
-#: mail/openpgp-utils.c:80
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Veuillez saisir votre %s phrase de passe"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 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:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 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:1049
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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:588
 msgid "No recipients specified"
 msgstr "Aucun destinataires sp�cifi�s"
 
-#: mail/openpgp-utils.c:1060
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Ne peut cr�er de fichier temporaire : %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Score"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr "Afficher les dossiers commen�ant avec :"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:292
+#: mail/subscribe-dialog.c:280
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier � %s �"
 
-#: mail/subscribe-dialog.c:296
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr "D�sabonnement au dossier � %s �"
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "S'abonne au dossier � %s �"
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Se d�sabonne du dossier � %s �"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6285,7 +6499,7 @@ msgstr "Pas suffisemment d'espace pour cr�er le dossier"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
+#: shell/importer/importer.c:157
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6293,64 +6507,64 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:307
+#: shell/importer/importer.c:309
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Il n'y a pas de nouveaux messages sur %s."
 
-#: shell/importer/importer.c:317
+#: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/importer/importer.c:325
+#: shell/importer/importer.c:327
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:340
+#: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/importer/importer.c:355
+#: shell/importer/importer.c:357
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:426
+#: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/importer/importer.c:476
+#: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "S�lectionner un fichier"
 
-#: shell/importer/importer.c:491
+#: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "Importer"
 
-#: shell/importer/importer.c:605
+#: shell/importer/importer.c:609
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -6540,7 +6754,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrep�t local -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6628,61 +6842,61 @@ msgstr "Supprime ce raccourci de la barre de raccourcis"
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vue"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Voir le s�lecteur de dossier"
 
-#: shell/e-storage.c:160
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Erreur g�n�rique"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le m�me nom existe"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier sp�cifi� n'est pas valide"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour cr�er le dossier"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas impl�ment� dans cet entrepot"
 
-#: shell/e-storage.c:427
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Permission refus�e"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Op�ration non support�e"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
@@ -6691,26 +6905,25 @@ msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 msgid "The Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Bonjour.\n"
 "Merci d'avoir pris le temps de t�l�charger cette version d'aper�u\n"
@@ -6734,7 +6947,7 @@ msgstr ""
 "Nous esp�rons que vous appr�cierez le r�sultat de notre dur labeur,\n"
 "et nous attendons avec impatience vos contributions !\n"
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6742,15 +6955,15 @@ msgstr ""
 "Merci\n"
 "L'�quipe d'Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "D�sactiver."
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
@@ -6774,40 +6987,53 @@ msgstr "Rechercher un contact"
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Visualise le message a imprimer"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Arr�ter"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Arr�te le chargement"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Tout voir"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Voir tous les contacts"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Configuration du carnet d'_adresses..."
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Sources du carnet d'adresses"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Imprimer les contacts..."
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Contacts"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Imprimer..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -6819,117 +7045,119 @@ msgstr "5 jours"
 msgid "Alter preferences"
 msgstr "Modifier les pr�f�rences"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ca_lendrier"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Pr�f�rences du calendrier..."
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Cr�e un nouveau calendrier"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Aller �"
+
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Aller �"
-
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Va � une date pr�cise"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Va � la date actuelle"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Suivant"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Ouvrir un calendrier"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Pr�c"
 
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Imprimer le Calendrier"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Enregistrer le calendrier comme quelquechose d'autre"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Affiche une journ�e"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Rendez-vous"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Imprimer ce calendrier"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
@@ -6955,7 +7183,7 @@ msgid "Print this item"
 msgstr "Imprime cet �l�ment"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimer..."
 
@@ -6988,17 +7216,13 @@ msgid "Send _message to contact..."
 msgstr "Envoie un _message au contact..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fichier"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Imprimer..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Enregistrer"
@@ -7048,7 +7272,7 @@ msgstr "Ferme ce rendez-vous"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Cop_ier vers le dossier... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Copier"
@@ -7065,6 +7289,10 @@ msgstr "Couper"
 msgid "Cut the selection"
 msgstr "Coupe la s�lection"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Supprimer ce rendez-vous"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr ""
@@ -7140,12 +7368,8 @@ msgstr "Configuration de l'impr_ession..."
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propri�t�s"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -7160,11 +7384,6 @@ msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
 msgid "Save the current file"
 msgstr "la date actuelle"
 
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "S�lectionnez un Dossier"
-
 #: ui/evolution-event-editor.xml.h:46
 #, fuzzy
 msgid "Schedule _Meeting"
@@ -7192,18 +7411,18 @@ msgstr ""
 msgid "Task _Request (FIXME)"
 msgstr "_T�che (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "� _propos..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Fermer"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
@@ -7211,19 +7430,13 @@ msgstr "_Contact (FIXME)"
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_D�bog"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_�dition"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Aide"
 
@@ -7266,7 +7479,8 @@ msgstr "_Coller"
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propri�t�s..."
 
@@ -7305,211 +7519,264 @@ msgstr ""
 msgid "New Mail"
 msgstr "Nouveau courrier"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Composer"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Compose un nouveau message"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Copie le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
 #, fuzzy
-msgid "Create Rule"
-msgstr "Cr�e \"%s\""
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "D_ossier"
+msgid "Create _Virtual Folder From Message"
+msgstr "Cr�er une r�gle � partir du message"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Fi_ltrer sur l'exp�diteur"
+msgid "Display all of the message headers"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtrer sur les _destinataires"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Jours vides :"
 
 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filtre sur l'exp�diteur"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filtre sur les destinataires"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filtre sur le sujet"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "R�cup�rer"
-
 #: ui/evolution-mail.xml.h:16
 #, fuzzy
+msgid "Forward As"
+msgstr "Faire suivre"
+
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "Rechercher compl�te"
+
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Supprimer le message"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Message suivi - %s"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtres de message..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "G�rer les abonnements..."
-
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "_Marquer comme lus"
-
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marquer comme _non lu"
+#, fuzzy
+msgid "Inline"
+msgstr "Voir en ligne"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "D�placer"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "G�rer les abonnements..."
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "D�place le message vers un nouveau dossier"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Marquer comme lu"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Visualise le message a imprimer"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Marquer comme lu"
+
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Marquer comme non lu"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Aper�u avant impression du message..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Nettoyer l'affichage des messages"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprime le message vers l'imprimante"
+msgid "Move"
+msgstr "D�placer"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Imprimer le message..."
+msgid "Move message to a new folder"
+msgstr "D�place le message vers un nouveau dossier"
 
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "R�pondre � _tous"
+msgid "Print message to the printer"
+msgstr "Imprime le message vers l'imprimante"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "R�pondre � l'_exp�diteur"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Note"
 
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "R�pondre � _tous"
+
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "S_ource"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "S�lectionnez _tout"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "S�lectionnez _tout"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "R�ception des messages"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Afficher _tous les messages"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Afficher tout"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Dossier virtuel sur le sujet"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Voir la source brut du message"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "�diteur de dossier _virtuel..."
+
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Actions"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Appliquer les filtres"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:58
 #, fuzzy
-msgid "_Configure Folder..."
-msgstr "_Copier vers le dossier..."
+msgid "_Compose"
+msgstr "Composer"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_�diter le message"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtrer sur le sujet"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtres de message..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Dossier"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverser la s�lection"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "Configuration de la _messagerie..."
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Message �lectronique (FIXME)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "R�glages..."
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Message"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_D�placer vers le dossier..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Ouvrir dans une nouvelle fen�tre"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Imprimer le message"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Ouvrir la t�che"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Enregistrer le message sous..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "R�ception des messages"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Enfiler"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_R�cup�rer"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Dossier Virtuel sur le sujet"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "�diteur de dossier _virtuel..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
@@ -7615,15 +7882,55 @@ msgstr "Afficher les pi�ces-jointes"
 msgid "Sign this message with your PGP key"
 msgstr "Signer ce message avec votre cl� PGP"
 
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Commute l'affichage de la barre de dossiers"
+
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Commute l'affichage de la barre de dossiers"
+
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Commute l'affichage de la barre de dossiers"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Insertion"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Ins�rer un fichier texte... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "R�pondre-� :"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_S�curit�"
 
@@ -7631,6 +7938,10 @@ msgstr "_S�curit�"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ajouter le dossier � votre liste de dossier abonn�s"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "D_ossier"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Rafra�chir la liste"
@@ -7719,7 +8030,7 @@ msgstr "D�faire"
 msgid "Undo the last action"
 msgstr "Supprimer l'action"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "_Rendez-vous (FIXME)"
 
@@ -7737,8 +8048,9 @@ msgid "Create a new task"
 msgstr "Cr�e une nouvelle tache"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nouveau"
+#, fuzzy
+msgid "New Task"
+msgstr "T�che"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7748,6 +8060,11 @@ msgstr "Enregistrer la tache comme quelquechose d'autre"
 msgid "Tasks Preferences..."
 msgstr "Pr�f�rences des taches..."
 
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "T�che"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "� propos d'Evolution..."
@@ -7757,8 +8074,9 @@ msgid "Close this window"
 msgstr "Ferme cette fenetre"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Personnaliser..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Personnaliser la barre d'outils"
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7781,97 +8099,97 @@ msgid "Evolution bar _shortcut"
 msgstr "Barre de _raccourcis d'Evolution"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Quitter"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "Pr�t � _d�marrer"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importer un format de fichier externe"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Evolution"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Afficher la barre de _dossiers"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Afficher la barre de raccourci_s"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "_Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Utilisation du gestionnaire de c_ontact"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Utilisation du _calendrier"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Utilisation de la _messagerie"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Travail en cours"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "� _propos d'Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importer un fichier..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Message �lectronique (FIXME)"
 
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nouveau dossier virtuel"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_R�glages"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Afficher la barre de _raccourcis"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -7952,6 +8270,11 @@ msgstr "Heure de _fin de la r�union :"
 msgid "All Attendees"
 msgstr "Tout les invit�s"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "la date actuelle"
+
 #. 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
@@ -7963,26 +8286,68 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Maintenant"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: 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.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: 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"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Rechercher"
+
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Avanc�e"
+
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Avanc�e..."
+
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Information"
@@ -8004,7 +8369,7 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:135
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "Recher_cher"
 
@@ -8016,24 +8381,373 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:182
+#: wombat/wombat.c:153
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:194
+#: wombat/wombat.c:165
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:207
+#: wombat/wombat.c:178
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "La suite de travail collaboratif Evolution"
+#~ msgid "Disabled"
+#~ msgstr "D�sactiv�"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchroniser"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copier depuis le Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copier vers le Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Fusionner depuis le Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Fusionner vers le Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Auteur originel : "
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Conduit 'Contact' d'Evolution"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 la Free Software Foundation et Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr ""
+#~ "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Synchronise l'action"
+
+#~ msgid "Conduit state"
+#~ msgstr "�tat du conduit"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Aucun Pilot configur�, choisissez la capplet\n"
+#~ "'Propri�t�s du lien Pilot' en premier."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Non connect� au d�mon gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Une erreur est survenue durant la r�cup�ration de\n"
+#~ "la liste des Pilot depuis le d�mon gnome-pilot"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Configuration du conduit Adresses"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Conduit Adresses"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Conduite � Calendrier � d'Evolution"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr ""
+#~ "Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Configuration du conduit calendrier"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Conduit Calendrier"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Configuration du conduit `A Faire'"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Conduit Evolution `A Faire'"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Conduite � � faire � d'Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr ""
+#~ "Utilitaire de configuration pour la conduite � � faire � d'Evolution.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "La priorit� doit �tre comprise entre 1 et 9 inclus"
+
+#, fuzzy
+#~ msgid "Schedule meeting"
+#~ msgstr "S�lectionnez un Dossier"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "�diter ce rendez-vous..."
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Entrez l'identit� sous laquelle vous d�sirez envoyer ce message"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Entrez le sujet du message"
+
+#~ msgid "Saving changes to message..."
+#~ msgstr "Enregistrement des changements dans le message..."
+
+#~ msgid "Save changes to message..."
+#~ msgstr "Enregistrer les changements dans le message..."
+
+#~ msgid "Error saving composition to 'Drafts': %s"
+#~ msgstr ""
+#~ "Erreur de l'enregistrement de la composition dans � Brouillons � : %s"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "�diter la R�gle du Filtre"
+
+#~ msgid "incoming"
+#~ msgstr "entrant"
+
+#~ msgid "outgoing"
+#~ msgstr "sortant"
+
+#~ msgid "Add Rule"
+#~ msgstr "Ajouter une r�gle"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Ajouter une r�gle de dossier virtuel"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "�ditez la r�gle du dossier virtuel"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Le corps ou le sujet contient"
+
+#~ msgid "Body contains"
+#~ msgstr "Le corps contient"
+
+#~ msgid "Subject contains"
+#~ msgstr "Le sujet contient"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Le corps ne contient pas"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Le sujet ne contient pas"
+
+#, fuzzy
+#~ msgid "Sender contains"
+#~ msgstr "Le nom contient"
+
+#~ msgid "Connecting to server"
+#~ msgstr "Connexion au serveur"
+
+#~ msgid "Connect to server"
+#~ msgstr "Connecter au serveur"
+
+#~ msgid "Account Properties"
+#~ msgstr "Propri�t�s du compte"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "Adresse �lectronique :"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Serveur de courrier entrant"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Divers"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Serveur de courrier sortant"
+
+#~ msgid "Servers"
+#~ msgstr "Serveurs"
+
+#~ msgid "Registering local folder"
+#~ msgstr "Enregistrement du dossier local"
+
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut enregistrer le dossier � %s � :\n"
+#~ "%s"
+
+#~ msgid "Appending \"%s\""
+#~ msgstr "Adjation de � %s �"
+
+#~ msgid "Appending a message without a subject"
+#~ msgstr "Adjoint un message sans sujet"
+
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "D�placement des messages de � %s � vers � %s �"
+
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Duplication des messages de � %s � vers � %s �"
+
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "D�place les messages de � %s � vers � %s �"
+
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copie les messages de � %s � vers � %s �"
+
+#~ msgid "(No description)"
+#~ msgstr "(Aucune description)"
+
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Chargement de %s dossier pour %s"
+
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Charge %s dossier pour %s"
+
+#~ msgid ""
+#~ "Error while preparing to %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erreur durant le pr�paration vers %s :\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erreur durant � %s � :\n"
+#~ "%s"
+
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "Erreur de lecture des commandes de l'enfilade envoy�."
+
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr "Message corrompu de l'enfilade envoy�e ?"
+
+#~ msgid "Could not create dialog box."
+#~ msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#~ msgid "User cancelled query."
+#~ msgstr "L'utilisateur a annul� la requ�te"
+
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir l'emplacement � %s � :\n"
+#~ "%s"
+
+#~ msgid "Subscribe to folder \"%s\""
+#~ msgstr "S'abonne au dossier � %s �"
+
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Se d�sabonne du dossier � %s �"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configuration du carnet d'_adresses..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimer les contacts..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ca_lendrier"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Pr�f�rences du calendrier..."
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimer ce calendrier"
+
+#, fuzzy
+#~ msgid "Create Rule"
+#~ msgstr "Cr�e \"%s\""
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fi_ltrer sur l'exp�diteur"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtrer sur les _destinataires"
+
+#~ msgid "Get Mail"
+#~ msgstr "R�cup�rer"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "_Marquer comme lus"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marquer comme _non lu"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Aper�u avant impression du message..."
+
+#~ msgid "Print message..."
+#~ msgstr "Imprimer le message..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "R�pondre � l'_exp�diteur"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Afficher _tous les messages"
+
+#, fuzzy
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Copier vers le dossier..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_�diter le message"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtrer sur le sujet"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configuration de la _messagerie..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Ouvrir dans une nouvelle fen�tre"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimer le message"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Enregistrer le message sous..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Dossier Virtuel sur le sujet"
+
+#~ msgid "New"
+#~ msgstr "Nouveau"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "_Personnaliser..."
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Afficher la barre de _dossiers"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Afficher la barre de raccourci_s"
+
+#~ msgid "_Settings"
+#~ msgstr "_R�glages"
 
 #~ msgid ""
 #~ "\n"
@@ -8101,9 +8815,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Open..."
 #~ msgstr "Ouvrir..."
 
-#~ msgid "Open the task"
-#~ msgstr "Ouvrir la t�che"
-
 #~ msgid "You have no Outbox configured"
 #~ msgstr "Vous n'avez pas de bo�te de sortie configur�"
 
@@ -8239,9 +8950,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "FIXME: For_ward"
 #~ msgstr "Faire suivre"
 
-#~ msgid "_Insert"
-#~ msgstr "_Insertion"
-
 #, fuzzy
 #~ msgid "FIXME: Previous"
 #~ msgstr "Pr�c"
@@ -8285,9 +8993,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "_Audio"
 #~ msgstr "_Audio"
 
-#~ msgid "_Contacts"
-#~ msgstr "_Contacts"
-
 #~ msgid "_Display"
 #~ msgstr "_Affichage"
 
@@ -8300,9 +9005,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "event-editor-dialog"
 #~ msgstr "event-editor-dialog"
 
-#~ msgid "Server disconnected."
-#~ msgstr "Serveur d�connect�."
-
 #~ msgid "Show all hidden"
 #~ msgstr "Afficher tous les cach�s"
 
@@ -8365,9 +9067,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Full name:"
 #~ msgstr "Nom complet :"
 
-#~ msgid "Email address:"
-#~ msgstr "Adresse �lectronique :"
-
 #~ msgid "Signature File"
 #~ msgstr "Fichier de signature"
 
@@ -8459,9 +9158,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Send messages in HTML format"
 #~ msgstr "Envoie les messages au format HTML"
 
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "�lement(s) appartenant � ces cat�gories : "
-
 #~ msgid "Available Categories:"
 #~ msgstr "Cat�gories disponibles : "
 
@@ -8477,9 +9173,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Headings:"
 #~ msgstr "En-t�tes :"
 
-#~ msgid "Empty days:"
-#~ msgstr "Jours vides :"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Jour mis en �vidence :"
 
@@ -8595,9 +9288,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Display message UID \"%s\""
 #~ msgstr "Affiche le message UID \"%s\""
 
-#~ msgid "Clear message display"
-#~ msgstr "Nettoyer l'affichage des messages"
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Ouverture des messages du dossier \"%s\""
 
@@ -8614,10 +9304,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgstr "R�cup�ration du message %d sur %d (uid \"%s\")"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Joints les messages du dossier \"%s\""
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Ouverture des messages du dossier \"%s\""
 
@@ -8630,9 +9316,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ouveau serveur d'annuaire"
 
-#~ msgid "_Actions"
-#~ msgstr "_Actions"
-
 #~ msgid "_Save Calendar As"
 #~ msgstr "Enregistrer le calendrier _sous"
 
@@ -8942,9 +9625,6 @@ msgstr "La suite de travail collaboratif Evolution"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Mauvaise URL de stockage (aucun serveur) : %s"
 
-#~ msgid "Full Search"
-#~ msgstr "Rechercher compl�te"
-
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
 #~ "By filling in some information about your email\n"
diff --git a/po/ga.po b/po/ga.po
index c63667fcf6..2d77fe743b 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,374 +2,208 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Alastair McKinstry, <mckinstry@computer.org>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
 "Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: 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"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: 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
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -385,131 +219,36 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
+#: 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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:201
@@ -520,343 +259,440 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-#, fuzzy
-msgid "_Delete"
-msgstr "Scr�os"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
+#: addressbook/contact-editor/contact-editor.glade.h:7
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
+#: addressbook/contact-editor/contact-editor.glade.h:9
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "_Home"
+msgid "No_tes:"
 msgstr "_Nota"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Company:"
 msgstr "Greamaigh"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#, fuzzy
+msgid "_Delete"
+msgstr "Scr�os"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: addressbook/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "_Home"
+msgstr "_Nota"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
+msgid "Delete Contact?"
+msgstr "Scr�os an sceal seo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/contact-editor/e-contact-editor.c:590
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 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
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 #, fuzzy
 msgid "Company"
 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
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 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
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 #, fuzzy
 msgid "Primary"
 msgstr "Tosa�ocht"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "_Fillte�n"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+msgid "Full Name"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Post"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "Tosa�ocht"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:26
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook.c:237
+msgid "As _Minicards"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -868,27 +704,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -896,183 +732,442 @@ msgstr ""
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 msgid "Subtree"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Tosa�ocht"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Scr�os"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+msgid "Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+msgid "Add to Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Evolution Addressbook minicard viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Scr�os"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Scr�os"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#, fuzzy
+msgid "Find..."
+msgstr "Priont�il"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select Names"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+msgid "n"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+#, fuzzy
+msgid "o"
+msgstr "Do"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+#, fuzzy
+msgid "r"
+msgstr "�:"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+msgid "Click here to add a contact"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1081,219 +1176,460 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
 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 "
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "Font..."
+msgstr "Priont�il"
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
+#: addressbook/printing/e-contact-print.glade.h:9
 #, fuzzy
-msgid "Snooze"
+msgid "Footer:"
+msgstr "_Fillte�n"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+#, fuzzy
+msgid "Format"
+msgstr "Sheoladh Chuig duine"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "Post"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
+#, fuzzy
+msgid "Options"
+msgstr "_Osc�il"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Priont�il"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#, fuzzy
+msgid "Portrait"
+msgstr "Tosa�ocht"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
 msgstr "M�id"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
+#: addressbook/printing/e-contact-print.glade.h:38
+#, fuzzy
+msgid "Style name:"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Top:"
+msgstr "Do:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Type:"
+msgstr "Do:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: 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"
+#: calendar/gui/calendar-commands.c:233
+msgid "File not found"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
+#: calendar/gui/calendar-commands.c:257
+msgid "Open calendar"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
+#: calendar/gui/calendar-commands.c:299
+msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-commands.c:451
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 #, fuzzy
 msgid "Private"
 msgstr "Priont�il"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+#, fuzzy
+msgid "Normal"
+msgstr "Sheoladh Chuig duine"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
 msgstr ""
 
-#. strptime format for a date.
-#: 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"
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
 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:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
 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:900
-msgid "%I:%M %p%n"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:805
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 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/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1013
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1600
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "_Nota"
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#, fuzzy
+msgid "Snooze"
+msgstr "M�id"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
@@ -1306,223 +1642,814 @@ msgstr ""
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+msgid "Close"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Edit appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Calendar"
+msgstr "_Fillte�n"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Colors"
+msgstr "_Fillte�n"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Defaults"
+msgstr "Scr�os"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Reminders"
+msgstr "Post"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+#, fuzzy
+msgid "Sunday"
+msgstr "Post"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "_Teacs"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "seconds."
+msgstr "Post"
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:71
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:80
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:89
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "Date & Time"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Priont�il"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Task"
+msgstr "_Teacs"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+msgid "URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Priority:"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, 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/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Tosa�ocht"
-
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "Summary"
 msgstr "Post"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
-#, fuzzy
-msgid "Open..."
-msgstr "_Osc�il"
+#: calendar/gui/e-calendar-table.c:169
+msgid "Click here to add a task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 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 "Scr�os"
+#: calendar/gui/e-calendar-table.c:556
+msgid "Edit this task..."
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-calendar-table.c:560
 #, fuzzy
 msgid "Delete the task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
 #, fuzzy
-msgid "New appointment..."
+msgid "New Appointment..."
 msgstr "_Coinne"
 
-#: 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:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Open"
+msgstr "_Osc�il"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
 #, fuzzy
-msgid "Delete this appointment"
+msgid "Delete this Appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
 #, fuzzy
-msgid "Delete this occurrence"
+msgid "Make this Occurrence Movable"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-itip-control.c:153
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+msgid "Component successfully updated."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+msgid "I couldn't read your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+msgid "Component successfully deleted."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+msgid "I don't recognize this type of calendar component."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772
+msgid "Add to Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:806
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Scr�os"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852
+msgid "Update Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:875
+msgid "Cancel Meeting"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Post an sce�l seo"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Scr�os"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Post"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+msgid "Attendee address"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+msgid "Chair"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+msgid "Meeting Invitations"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+msgid "Organizer: "
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "Scr�os"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1534,303 +2461,550 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
+#: calendar/gui/e-week-view.c:3255
 #, fuzzy
-msgid "Edit Appointment"
+msgid "Delete All Occurrences"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
+#: calendar/gui/event-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Exceptions"
+msgstr "_Osc�il"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
 msgstr ""
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor.c:441
+#: calendar/gui/event-editor-dialog.glade.h:20
 #, fuzzy
-msgid "Sunday"
+msgid "Reminder"
+msgstr "Post"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
 msgstr "Post"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+msgid "Settings..."
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+msgid "Show a dialog"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+msgid "_End time:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr ""
+
+#: calendar/gui/event-editor.c:371
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, c-format
+msgid " %d days"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1534
+msgid " 1 day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1537
+#, c-format
+msgid " %d weeks"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1539
+msgid " 1 week"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1542
+#, c-format
+msgid " %d hours"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1544
+msgid " 1 hour"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1547
+#, c-format
+msgid " %d minutes"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1549
+msgid " 1 minute"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr "Post"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr "Post"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
 msgstr ""
 
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr ""
+
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Fr"
 msgstr "�:"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 #, fuzzy
 msgid "Tasks"
 msgstr "_Teacs"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr ""
 
@@ -1838,10 +3012,80 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-filter-driver.c:790
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:795
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:323
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:333
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -1918,108 +3162,225 @@ msgstr ""
 msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+msgid "Authentication failed."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:130
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-search-private.c:105
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "_Teacs"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Post an sce�l seo"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -2031,7 +3392,7 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr ""
 
@@ -2049,13 +3410,18 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Fillte�n _Nua"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2067,25 +3433,40 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Secure IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:415
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2093,7 +3474,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2122,50 +3503,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -2202,42 +3575,42 @@ msgstr "Post an sce�l seo"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 msgid "not a maildir directory"
 msgstr ""
 
@@ -2268,99 +3641,111 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Fillte�n _Nua"
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+msgid "Synchronising folder"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -2371,7 +3756,7 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -2443,16 +3828,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "_Post sce�l"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "_Post sce�l"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -2467,70 +3862,82 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 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:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -2571,143 +3978,261 @@ msgstr ""
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+msgid "Could not find 'From' address in message"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Post an sce�l seo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Post"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+msgid "Temporary authentication failure"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+msgid "Authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
@@ -2733,19 +4258,15 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: 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"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr ""
@@ -2758,143 +4279,386 @@ msgstr ""
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+msgid "Attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Inline attachment"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:7
 #, fuzzy
-msgid "From:"
-msgstr "�:"
+msgid "Send as:"
+msgstr "Post"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#, fuzzy
+msgid "From:"
+msgstr "�:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Freagrair"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Abair:"
+
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 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:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Abair:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr ""
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Post an sce�l seo"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:961
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sce�l seo"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""
+
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr ""
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr ""
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr ""
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: executive-summary/component/component-factory.c:152
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Post"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, c-format
+msgid "Close %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Fillte�n _Nua"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Fillte�n _Nua"
+
+#: executive-summary/component/e-summary.c:918
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:932
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "Post"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+msgid "Factory for the test bonobo component."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+msgid "Factory for the test component."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+msgid "Error"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update every "
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr ""
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
@@ -2935,10 +4699,6 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr ""
-
 #: filter/filter-datespec.c:68
 #, fuzzy
 msgid "second"
@@ -3002,38 +4762,20 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 #, fuzzy
 msgid "Remove action"
 msgstr "Scr�os"
@@ -3044,7 +4786,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
@@ -3057,421 +4799,505 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr ""
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "Scr�os"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:5
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "_Fillte�n"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "_Fillte�n"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "_Fillte�n"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
+msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Fillte�n _Nua"
+msgid "does not exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
+msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
+#: filter/libfilter-i18n.h:17
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Post"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Abair"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Fillte�n _Nua"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "was after"
+msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
-msgid "was before"
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Abair"
 
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/libfilter-i18n.h:47
+msgid "was after"
 msgstr ""
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
+#: filter/libfilter-i18n.h:48
+msgid "was before"
 msgstr ""
 
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: filter/score-editor.c:126
+msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Fillte�n _Nua"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
+#: mail/folder-browser-factory.c:237
+#, c-format
+msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser.c:239
-msgid "Body contains"
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:219
 #, fuzzy
-msgid "Subject contains"
-msgstr "Abair"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
+msgid "Store search as vFolder"
+msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Osc�il"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Priont�il"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr ""
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 #, 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%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
+#: mail/folder-browser.c:705
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:2
 #, fuzzy
-msgid "None"
-msgstr "_Nota"
+msgid "Mailbox Format"
+msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-accounts.c:115
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "maildir"
+msgstr "Post"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr ""
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Scr�os"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 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
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr ""
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3487,12 +5313,16 @@ msgstr "Abair"
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr ""
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3500,100 +5330,364 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:3
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+msgid "Authentication Type:"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Check settings"
+msgstr ""
+
+#: mail/mail-config.glade.h:12
+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 ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Scr�os"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "_Nota"
+
+#: mail/mail-config.glade.h:23
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Evolution Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Hostname:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "Keep mail on server"
+msgstr ""
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Post"
+
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "Mail"
+msgstr "Post"
+
+#: mail/mail-config.glade.h:36
+msgid "Mail Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Mail Configuration Druid"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+msgid "Mark messages as \"Read\" after:"
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "News"
+msgstr "_Nua"
+
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Optional"
+msgstr "_Osc�il"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Password:"
+msgstr ""
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:52
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
+msgid "Reply address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Save password"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-config.glade.h:59
+msgid "Send mail in HTML format by default."
+msgstr ""
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Post"
+
+#: mail/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:63
+#, fuzzy
+msgid "Server Type: "
+msgstr "Post"
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Post"
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config.glade.h:67
+msgid "Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr ""
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Transport"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Transport Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Type"
+msgstr ""
+
+#: mail/mail-config.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.glade.h:75
+msgid "User Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr ""
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr ""
+
+#: mail/mail-config.glade.h:83
+msgid "minutes."
+msgstr ""
+
+#: mail/mail-config-druid.c:421
 #, 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
+#: mail/mail-config-druid.c:515
+msgid "Namespace:"
+msgstr ""
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3601,638 +5695,669 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
+#: mail/mail-format.c:704
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Freagrair"
+msgid "Loading message content"
+msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-local.c:508
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 #, fuzzy
 msgid "Copying messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr ""
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
+#: mail/mail-ops.c:1193
+#, c-format
+msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
+#: mail/mail-ops.c:1760
+msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1803
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "_Fillte�n"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
+#: mail/mail-send-recv.c:136
+msgid "Cancelling ..."
 msgstr ""
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
+#: mail/mail-send-recv.c:231
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
+#: mail/mail-send-recv.c:234
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "Post"
+
+#: mail/mail-send-recv.c:469
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:473
+msgid "Complete."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 #, fuzzy
 msgid "VFolders"
 msgstr "_Fillte�n"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 #, fuzzy
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Scr�os an sceal seo"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+msgid "Multiple Unseen Messages"
+msgstr ""
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Post an sce�l seo"
+
+#: mail/message-list.c:952
 #, 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:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-msgid "Attachment"
-msgstr ""
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "From"
 msgstr "�:"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Scr�os"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "To"
 msgstr "Do:"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "Size"
 msgstr "M�id"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:92
 #, 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
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 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
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 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
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "_Fillte�n"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 msgid "Store"
 msgstr ""
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: mail/subscribe-dialog.c:280
 #, c-format
-msgid "Get store for \"%s\""
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:282
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "_Fillte�n"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_Fillte�n"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:309
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:319
+msgid "Importing"
+msgstr ""
+
+#: shell/importer/importer.c:327
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:342
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "_Fillte�n"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Fillte�n _Nua"
+
+#: shell/importer/importer.c:493
+msgid "File type:"
+msgstr ""
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
 msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
@@ -4258,7 +6383,7 @@ msgid "Evolution files successfully installed."
 msgstr ""
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
 #: shell/e-setup.c:190
@@ -4296,18 +6421,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -4317,7 +6442,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
@@ -4326,45 +6451,45 @@ msgstr "_Nua"
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 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:334
+#: shell/e-shell-view-menu.c:360
 #, fuzzy
 msgid "Go to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 #, fuzzy
 msgid "Folders"
 msgstr "_Fillte�n"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
@@ -4374,7 +6499,7 @@ msgstr "Evolution"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4452,90 +6577,98 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 #, fuzzy
 msgid "_View"
 msgstr "_Nua"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr ""
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4543,684 +6676,1543 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
+msgid "Create new contact"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Coinne"
+msgid "Delete a contact"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:10
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_Post sce�l"
+msgid "New contact"
+msgstr "_Coinne"
+
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "View All"
+msgstr "_Nua"
+
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+#, fuzzy
+msgid "_Print..."
+msgstr "Priont�il"
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Uirlis�"
+
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-calendar.xml.h:7
+msgid "Go To"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
-msgid "Page Set_up"
-msgstr "Priont�il"
+msgid "Go forward in time"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr ""
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Month"
+msgstr "Priont�il"
 
-#: ui/evolution-contact-editor.xml:72
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "_Object"
-msgstr "Abair"
+msgid "New Appointment"
+msgstr "_Coinne"
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-calendar.xml.h:16
+msgid "Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-calendar.xml.h:17
+msgid "Prev"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-calendar.xml.h:21
+msgid "Print calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-calendar.xml.h:22
+msgid "Print this Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "Sheoladh Chuig duine"
+msgid "Save As"
+msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 day"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:104
-#, fuzzy
-msgid "_Toolbars"
-msgstr "_Uirlis�"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "_Coinne"
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Nua"
+
+#: ui/evolution-calendar.xml.h:34
+msgid "_Open Calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-contact-editor.xml.h:2
+#, fuzzy
+msgid "Delete this item"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-contact-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Scr�os"
+
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+#, fuzzy
+msgid "Print this item"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#, fuzzy
+msgid "Print..."
+msgstr "Priont�il"
+
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+#, fuzzy
+msgid "Save _As..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "_Post sce�l"
+
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Forms"
+msgid "_File"
 msgstr "_Fillte�n"
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Coinne"
+msgid "_Save"
+msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+msgid "About this application"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
+msgid "Address _Book... (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#, fuzzy
+msgid "C_lear"
+msgstr "_Fillte�n"
+
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+#, fuzzy
+msgid "C_ut"
+msgstr "Gearr"
+
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#, fuzzy
+msgid "Chec_k Names (FIXME)"
 msgstr "_Post sce�l"
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#, fuzzy
+msgid "Clear"
+msgstr "_Fillte�n"
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+msgid "Clear the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#, fuzzy
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Greamaigh"
+
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Gearr"
+
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-event-editor.xml.h:18
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "_Post sce�l"
+msgid "Delete this appointment"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_Post sce�l"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:156
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 #, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "Sheoladh Chuig duine"
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-contact-editor.xml:157
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 #, fuzzy
-msgid "FIXME: For_ward"
+msgid "For_ward (FIXME)"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Uirlis�"
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+msgid "In_complete Task (FIXME)"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+#, fuzzy
+msgid "Paste"
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
 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"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+msgid "Print Pre_view"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#, fuzzy
+msgid "Print Setup"
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
+#: ui/evolution-event-editor.xml.h:46
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
-msgid "_Options"
-msgstr "_Osc�il"
+msgid "Select All"
+msgstr "Fillte�n _Nua"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#, fuzzy
+msgid "Select everything"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+#, fuzzy
+msgid "_About..."
+msgstr "Evolution"
+
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+msgid "_Close"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#, fuzzy
+msgid "_Copy"
+msgstr "Greamaigh"
+
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Help"
+msgstr "_Nota"
+
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "_Post sce�l"
+
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#, fuzzy
+msgid "_Paste"
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "_Print"
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+#, fuzzy
+msgid "_Properties..."
+msgstr "Priont�il"
+
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "_Post sce�l"
+
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Add Service"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
+#: ui/evolution-executive-summary.xml.h:3
+msgid "Create a new email"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: ui/evolution-executive-summary.xml.h:5
+msgid "New Mail"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
+#: ui/evolution-mail.xml.h:3
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
+#: ui/evolution-mail.xml.h:6
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
 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"
+#: ui/evolution-mail.xml.h:10
+msgid "Empty Trash"
 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"
+#: ui/evolution-mail.xml.h:11
+msgid "Filter on Se_nder"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Recipients"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Abair"
+
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Forward As"
+msgstr "Sheoladh Chuig duine"
+
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "_Fillte�n"
+
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
 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"
+#: ui/evolution-mail.xml.h:23
+msgid "Manage _Subscriptions..."
 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"
+#: ui/evolution-mail.xml.h:24
+msgid "Mar_k as Read"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
+#: ui/evolution-mail.xml.h:25
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
+#: ui/evolution-mail.xml.h:26
+msgid "Mark as U_nread"
 msgstr ""
 
+#: ui/evolution-mail.xml.h:27
+msgid "Message _Display"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Fillte�n _Nua"
+msgid "Move"
+msgstr "Scr�os"
 
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
-#~ msgid "o"
-#~ msgstr "Do"
+msgid "Move message to a new folder"
+msgstr "Fillte�n _Nua"
 
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
-#~ msgid "Format"
-#~ msgstr "Sheoladh Chuig duine"
+msgid "Quoted"
+msgstr "_Nota"
 
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Tosa�ocht"
+msgid "Reply to _All"
+msgstr "Freagrair"
 
+#: ui/evolution-mail.xml.h:43
+msgid "S_ource"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 #, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Do:"
+msgid "Select _All"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail.xml.h:45
+msgid "Select _Thread"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:48
 #, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "_Coinne"
+msgid "Show _All"
+msgstr "Post an sce�l seo"
 
+#: ui/evolution-mail.xml.h:50
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Teacs"
+msgid "Threaded Message list"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail.xml.h:51
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:52
+msgid "VFolder on _Recipients"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:53
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Teacs"
+msgid "VFolder on _Subject"
+msgstr "Abair"
+
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:55
+msgid "Virtual Folder _Editor..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:56
 #, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Tosa�ocht"
+msgid "_Actions"
+msgstr "_Osc�il"
 
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:58
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "_Coinne"
+msgid "_Compose"
+msgstr "_Nota"
 
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Priont�il"
+msgid "_Copy to Folder..."
+msgstr "_Fillte�n"
 
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_Fillte�n"
+msgid "_Filters..."
+msgstr "_Fillte�n"
 
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Fillte�n"
+
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Scr�os"
+msgid "_Forward"
+msgstr "Sheoladh Chuig duine"
 
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Abair"
+msgid "_Mail Message"
+msgstr "_Post sce�l"
 
+#: ui/evolution-mail.xml.h:68
+msgid "_Mail Settings..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Post an sce�l seo"
+msgid "_Message Hiding"
+msgstr "_Post sce�l"
 
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Abair"
+msgid "_Move to Folder..."
+msgstr "S�bh�il 'san _fillte�n"
 
+#: ui/evolution-mail.xml.h:71
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Sheoladh Chuig duine"
+msgid "_Open Selected Items"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "_Nota"
+msgid "_Undelete"
+msgstr "Scr�os"
 
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+msgid "Close the current file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:5
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "_Nua"
+msgid "Encrypt this message with PGP"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_Osc�il"
+msgid "Save in _folder... (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
 
+#: ui/evolution-message-composer.xml.h:19
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Freagrair"
+msgid "Save in folder..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Post"
+msgid "Save the message in a specified folder"
+msgstr "Post an sce�l seo"
 
-#~ msgid "_New"
-#~ msgstr "_Nua"
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr "Post"
 
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "S�bh�il 'san _fillte�n"
+msgid "Send _Later"
+msgstr "Post"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "Scr�os an sceal seo"
+msgid "Send _later"
+msgstr "Post"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Scr�os"
+msgid "Send the message later"
+msgstr "Post an sce�l seo"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Priont�il"
+msgid "Send the message now"
+msgstr "Post an sce�l seo"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "S�bh�il 'san _fillte�n"
+msgid "Send this message now"
+msgstr "Post an sce�l seo"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Fillte�n"
+msgid "Show / hide attachments"
+msgstr "_Coinne"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Priont�il"
+msgid "Show _attachments"
+msgstr "_Coinne"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "_Fillte�n"
+msgid "Show attachments"
+msgstr "_Coinne"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Gearr"
+msgid "Sign this message with your PGP key"
+msgstr "Post an sce�l seo"
 
-#~ msgid "Copy"
-#~ msgstr "Greamaigh"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
 
-#~ msgid "Cut"
-#~ msgstr "Gearr"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:48
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Scr�os"
+msgid "_Insert text file... (FIXME)"
+msgstr "S�bh�il 'san _fillte�n"
 
+#: ui/evolution-message-composer.xml.h:49
 #, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Freagrair"
+msgid "_Open..."
+msgstr "_Osc�il"
 
-#~ msgid "Undo"
-#~ msgstr "Leas�"
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Freagrair"
 
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:3
 #, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Greamaigh"
+msgid "F_older"
+msgstr "_Fillte�n"
 
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:5
+msgid "Assig_n Task (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:29
+msgid "Meeting Re_quest (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:43
 #, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Priont�il"
+msgid "Redo"
+msgstr "Scr�os"
 
+#: ui/evolution-task-editor-dialog.xml.h:44
 #, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Leas�"
+msgid "Redo the undone action"
+msgstr "Scr�os"
 
+#: ui/evolution-task-editor-dialog.xml.h:45
 #, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_Fillte�n"
+msgid "Replace"
+msgstr "Freagrair"
 
+#: ui/evolution-task-editor-dialog.xml.h:46
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Scr�os an sceal seo"
+msgid "Replace a string"
+msgstr "Freagrair"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
+msgid "Reply to A_ll (FIXME)"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:48
+msgid "S_end Status Report (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr "Leas�"
+
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Post an sce�l seo"
+msgid "_Appointment (FIXME)"
+msgstr "_Coinne"
 
+#: ui/evolution-task-editor-dialog.xml.h:77
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Scr�os an sceal seo"
+msgid "_Mark Complete (FIXME)"
+msgstr "_Post sce�l"
+
+#: ui/evolution-task-editor-dialog.xml.h:84
+msgid "_Reply (FIXME)"
+msgstr ""
 
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-#~ msgid "Move"
-#~ msgstr "Scr�os"
+msgid "Create a new task"
+msgstr "Scr�os an sceal seo"
 
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Post an sce�l seo"
+msgid "New Task"
+msgstr "_Teacs"
 
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:6
+msgid "Tasks Preferences..."
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Post an sce�l seo"
+msgid "_Task"
+msgstr "_Teacs"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "_Post sce�l"
+msgid "About Evolution..."
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:3
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution.xml.h:5
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
+
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr ""
 
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
+
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr ""
+
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr ""
+
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr ""
+
+#: ui/evolution.xml.h:24
 #, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Sheoladh Chuig duine"
+msgid "_About Evolution..."
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "_Message"
-#~ msgstr "_Post sce�l"
+msgid "_Folder Bar"
+msgstr "_Fillte�n"
 
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "S�bh�il 'san _fillte�n"
+msgid "_Go to Folder..."
+msgstr "_Fillte�n"
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "_Post sce�l"
+msgid "_Import file..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr ""
 
+#: ui/evolution.xml.h:36
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Scr�os"
+msgid "_Mail message"
+msgstr "_Post sce�l"
 
+#: ui/evolution.xml.h:38
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Post an sce�l seo"
+msgid "_New Folder"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution.xml.h:39
+msgid "_Shortcut Bar"
+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 ""
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "S�bh�il 'san _fillte�n"
+msgid "_Options"
+msgstr "_Osc�il"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr ""
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+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:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr ""
+
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+msgid "%H:%M:%S"
+msgstr ""
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr ""
+
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+msgid "%I:%M:%S %p"
+msgstr ""
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:160
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:231
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:311
+msgid "Advanced ..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:141
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:148
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:162
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:169
+#, fuzzy
+msgid "Message"
+msgstr "_Post sce�l"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
 #, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "S�bh�il 'san _fillte�n"
+msgid "Don't show this message again."
+msgstr "Post an sce�l seo"
+
+#: widgets/misc/e-search-bar.c:140
+msgid "Sear_ch"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:153
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr ""
+
+#: wombat/wombat.c:165
+msgid "init_corba(): could not initialize GNOME"
+msgstr ""
 
-#~ msgid "Send"
-#~ msgstr "Post"
+#: wombat/wombat.c:178
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr ""
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Post an sce�l seo"
+#~ msgid "New"
+#~ msgstr "_Nua"
 
 #, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Post an sce�l seo"
+#~ msgid "Open..."
+#~ msgstr "_Osc�il"
 
 #, fuzzy
-#~ msgid "Send this message now"
+#~ msgid "Save changes to message..."
 #~ msgstr "Post an sce�l seo"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Post an sce�l seo"
+#~ msgid "Subject contains"
+#~ msgstr "Abair"
 
 #, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Osc�il"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Coinne"
 
 #, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution"
+#~ msgid "_Object"
+#~ msgstr "Abair"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Coinne"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "Sheoladh Chuig duine"
 
-#~ msgid "_Folder"
-#~ msgstr "_Fillte�n"
+#, fuzzy
+#~ msgid "_Toolbars"
+#~ msgstr "_Uirlis�"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
+#~ msgid "_Forms"
 #~ msgstr "_Fillte�n"
 
 #, fuzzy
-#~ msgid "_Mail message (FIXME)"
+#~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "_Post sce�l"
 
 #, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "_Coinne"
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "_Post sce�l"
 
 #, fuzzy
-#~ msgid "ninth"
-#~ msgstr "Priont�il"
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "Sheoladh Chuig duine"
+
+#, fuzzy
+#~ msgid "FIXME: For_ward"
+#~ msgstr "Sheoladh Chuig duine"
+
+#, fuzzy
+#~ msgid "Hide deleted"
+#~ msgstr "Scr�os"
+
+#, fuzzy
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Abair"
+
+#, fuzzy
+#~ msgid "_Undo"
+#~ msgstr "Leas�"
 
 #, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Post"
+#~ msgid "_Edit Message"
+#~ msgstr "_Post sce�l"
+
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "_Post sce�l"
 
 #, fuzzy
 #~ msgid "Rebuild message view"
diff --git a/po/gl.po b/po/gl.po
index 0f0b916bc1..aae4a510ce 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,11 +7,10 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:05+0100\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -19,183 +18,11 @@ 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 "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
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -203,7 +30,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
@@ -211,25 +38,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
@@ -237,7 +64,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -245,7 +72,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -253,7 +80,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -261,13 +88,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -275,7 +102,7 @@ msgstr ""
 "\n"
 "  R�a:         "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -283,7 +110,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
@@ -291,7 +118,7 @@ msgstr ""
 "\n"
 "  Rexi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -299,7 +126,7 @@ msgstr ""
 "\n"
 "  C�digo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -307,13 +134,13 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
@@ -321,7 +148,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
@@ -329,7 +156,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -337,7 +164,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -345,13 +172,13 @@ msgstr ""
 "\n"
 "Correo Electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -359,25 +186,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -385,31 +212,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -417,7 +244,7 @@ msgstr ""
 "\n"
 "Categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -435,13 +262,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -449,126 +276,25 @@ msgstr ""
 "\n"
 "Clave P�blica: "
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar do Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar � Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mesturar do Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mesturar � Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor Orixinal:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conducto de Libro de Enderezos de Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
-"Utilidade de configuraci�n para o conducto de libro de enderezos de "
-"evolution.\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Sincronizar Acci�n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado do conducto"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Non hai ning�n pilot configurado, escolla\n"
-"primeiro a capplet 'Propiedades da Ligaz�n co Pilot'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Non conectado � demo gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ocorreu un erro � obter a lista de\n"
-"pilots do demo gnome-pilot"
+#: 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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -578,353 +304,437 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Engadir"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
+msgstr "Engadir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Borrar"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "Ani_versario:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de Tel�fono"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "T_raballo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de tel�fono"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "_Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Engadir"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "C_ontactos..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ca_tegor�as..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _Completo..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Detalles"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Arquivar Como:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Enderezo da p�xina Web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Quere recibir correo _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Traballo"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "Xeral"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Particular"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Novo tipo de tel�fono"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax do Traballo"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "No_tas:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_M�bil"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Tipos de Tel�fono"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "T_raballo"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Quere recibir correo _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Este � o enderezo da lista de correo"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Enderezo da p�xina Web:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "_Engadir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ca_tegor�as..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Enderezo..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Posto:"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "Nome do _Asistente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "Cu_mpreanos:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "_Traballo"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Compa��a:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Enderezo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Xeral"
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_Borrar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "Nome _Completo..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Particular"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_Posto:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_M�bil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "_Sobrenome:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_C�nxuxe:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Cu_mpreanos:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Nome do _Asistente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "_Este � o enderezo da lista de correo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tas:"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "�Borrar Contacto?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detalles"
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "Elemento(s) pertencentes a estas categor�as:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 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
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Autom�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 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
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Correo Electr�nico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Correo Electr�nico 3"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Editar Filtros"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome Completo:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Correo Electr�nico 2"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Enderezo _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Canad�"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Check Address"
+msgstr "Enderezo"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "_Pa�s:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finlandia"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "Estados Unidos"
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Enderezo:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_Cidade:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr "_Apdo. de Correos:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "E_stado/Provincia:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "C�digo _Postal:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
 #, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+msgid "I"
+msgstr "Se"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"D.\n"
-"D�.\n"
-"Dr.\n"
-"Dra.\n"
-"Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "�"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Apelidos:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Tratamento:"
+
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Como unha _T�boa"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -936,31 +746,31 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo cont�n"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�n"
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�n"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosar� o navegador de carpetas"
 
@@ -969,200 +779,470 @@ msgstr "O URI que amosar� o navegador de carpetas"
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "_Ficheiro"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Contrasinal"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Erro desco�ecido"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 #, fuzzy
 msgid "Base"
 msgstr "Pegar"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscribir"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "DN Ra�z:"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autenticaci�n:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Cami�o:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "O ficheiro non existe."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descrici�n:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Engadir Fonte"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Editar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilidade de configuraci�n para o conducto de libro de enderezos de "
+"evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conducto de Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Prema aqu� para o libro de enderezos"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conducto de Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Buscar..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Message Recipients"
+msgstr "Destinatarios"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select Names"
+msgstr "Seleccionar un nome da Lista:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "Seleccionar un nome da Lista:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: 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:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 #, fuzzy
-msgid "Name"
-msgstr "Nome:"
+msgid "* Click here to add a contact *"
+msgstr "<prema aqu� para seleccionar unha data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "Correo Electr�nico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 #, fuzzy
 msgid "Department"
 msgstr "_Departamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 #, fuzzy
 msgid "Profession"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 #, fuzzy
 msgid "Manager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�nxuxe:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "No_tas:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "<prema aqu� para seleccionar unha data>"
+
 #: 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:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1176,129 +1256,314 @@ msgstr ""
 "\n"
 "Faga dobre clic aqu� para crear un novo Contacto."
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conducto de Axenda de Evolution"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 ptos. Tahoma"
 
-#: 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"
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 ptos. Tahoma"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Corpo"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Inferior:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Dimensi�ns:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Fonte..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Fontes"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Footer:"
+msgstr "Carpetas"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Formato"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "Autor"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilidade de configuraci�n para o conducto a-facer de evolution.\n"
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Cabeceiras"
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
 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 "
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Altura:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "Adiar"
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+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 "Aceptar"
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Horizontal"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Esquerda:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Pestanas coas letras no lateral"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Marxes"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "N�mero de columnas:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Opci�ns"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Orientaci�n"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "P�xina"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Configuraci�n da P�xina:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Papel"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Orixe do papel:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Vertical"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Previsualizaci�n:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Imprimir usando sombreado gris"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Invertir nas p�xinas pares"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Dereita:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Secci�ns:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Sombreado"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
+msgstr "Tama�o:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Iniciar nunha nova p�xina"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Nome do estilo:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Superior:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Tipo:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Largura:"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr "Erro comunicando co servidor de axenda"
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 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: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"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: 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: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:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Alta"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Baixa"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Non Iniciada"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+#, fuzzy
+msgid "Completed"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "Cancelar"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1309,36 +1574,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: 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"
-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: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: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: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:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1348,57 +1601,121 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1013
 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: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-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+msgid "Recurring"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Asignar Puntuaci�n"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "Agora"
+
+#: calendar/gui/calendar-summary.c:196
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 #, fuzzy
 msgid "%I:%M%p"
 msgstr "%I:%M %p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 #, fuzzy
 msgid "Display"
 msgstr "_Visualizar"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "Nova cita..."
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "anexo"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosar� a axenda"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
 #: 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"
@@ -1411,243 +1728,866 @@ msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "_Pechar"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 horas (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 horas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "Alarms timeout after"
+msgstr "As alarmas sonoras expiran tras"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr "Alarmas Sonoras"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Preferencias da Axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Cores"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Defaults"
+msgstr "Detalles"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Display options"
+msgstr "_Visualizar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr "Final do d�a:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr "Primeiro d�a da semana:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "Ven"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "Venres"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Highlight"
+msgstr "D�a salientado:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "Lun"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Luns"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "Nova cita..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Reminders"
+msgstr "Autor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "S�b"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "S�bado"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
+msgid "Show"
+msgstr "Ver Todos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Nova cita..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "Amosar n�meros de semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr "Inicio do d�a:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Domingo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "Xov"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Xoves"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "Time divisions:"
+msgstr "Dimensi�ns:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr "Formato da hora:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Mar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Martes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr "Alarmas Visuais"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "M�r"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "M�rcores"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#, fuzzy
+msgid "Work week"
+msgstr "semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "segundos."
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, 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:66
+#: calendar/gui/dialogs/delete-comp.c:71
 #, 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:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, 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:75
+#: calendar/gui/dialogs/delete-comp.c:80
 #, 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:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, 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:84
+#: calendar/gui/dialogs/delete-comp.c:89
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "�Est� seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Clasificaci�n"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data de env�o"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date Completed:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Pri_vado"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "P�_blico"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "_Resume:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#, fuzzy
+msgid "_Due Date:"
+msgstr "_Departamento:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, 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/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
 msgid "Categories"
 msgstr "categor�as"
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Clasificaci�n"
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completada"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalizaci�n:"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparente"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
+#: calendar/gui/e-calendar-table.c:169
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Prema aqu� para o libro de enderezos"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abrir a tarefa"
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: 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:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "Editar esta cita..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Editar Tarefa"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Borrar a tarefa"
+
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: 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..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nova cita..."
 
-#: 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:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "FIXME: Programar Reuni�n"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
+msgstr "Gardar o ficheiro actual"
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "Borrar este elemento"
+
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
+msgstr "Borrar un contacto"
+
+#: calendar/gui/e-itip-control.c:153
+#, fuzzy
+msgid "I couldn't update your calendar file!\n"
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Ficheiros de Evolution instalados con �xito."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+#, fuzzy
+msgid "I couldn't read your calendar file!\n"
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+#, fuzzy
+msgid "I couldn't update your calendar store."
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Ficheiros de Evolution instalados con �xito."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "Contas"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Eliminar"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "_Abrir axenda"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "FIXME: Programar Reuni�n"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A, %d de %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Pegar"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Imprimir axenda"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organizaci�n:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+msgid "Sender"
+msgstr "Autor"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "_Resume:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Enderezo"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "FIXME: Programar Reuni�n"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Autom�bil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "Hora do _inicio da reuni�n:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Informaci�n Opcional"
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Organizaci�n:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-meeting-dialog.glade.h:18
+#, fuzzy
+msgid ""
+"Request\n"
+"Meeting"
+msgstr "FIXME: Programar Reuni�n"
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+#, fuzzy
+msgid "Required Participant"
+msgstr "Persoas _Requiridas"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "M�bil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+#, fuzzy
+msgid ""
+"Schedule\n"
+"Time"
+msgstr "FIXME: Programar Reuni�n"
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Categor�as: "
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
@@ -1659,306 +2599,590 @@ msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Editar Cita"
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento de d�a _completo"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "d�a"
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
+msgstr "Citas:"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Citas:"
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Fontes"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Excepci�ns"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+#, fuzzy
+msgid "Modify"
 msgstr "Luns"
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Martes"
+#: calendar/gui/event-editor-dialog.glade.h:13
+#, fuzzy
+msgid "No recurrence"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "M�rcores"
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Xoves"
+#: calendar/gui/event-editor-dialog.glade.h:15
+#, fuzzy
+msgid "Preview"
+msgstr "Previsualizaci�n:"
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Venres"
+#: calendar/gui/event-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Recurrence"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "S�bado"
+#: calendar/gui/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
+#: calendar/gui/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Reminder"
+msgstr "Autor"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executar programa:"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "Recibindo correo de %s"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "_Configuraci�n"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "Amosar un d�a"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _finalizaci�n:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr "Data de _comezo:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "d�a(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "for"
+msgstr "cuarto"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "horas"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "until"
+msgstr "Sen_t�tulo"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/event-editor.c:371
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "d�a"
+
+#: calendar/gui/event-editor.c:601
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "d�as"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "Amosar un d�a"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "semanas"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "Amosar unha semana"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "horas"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "hora"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "minutos"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "10 minutos"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr " segundos"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr " segundos"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Borrar esta cita"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducto de Axenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, 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:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/gnome-cal.c:695
 #, 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:707
+#: calendar/gui/gnome-cal.c:706
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#. 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:1
+#, fuzzy
+msgid "April"
+msgstr "abril"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
+#: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
+msgid "August"
+msgstr "agosto"
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
+#: calendar/gui/goto-dialog.glade.h:3
+#, fuzzy
+msgid "December"
+msgstr "decembro"
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "M�r"
+#: calendar/gui/goto-dialog.glade.h:4
+#, fuzzy
+msgid "February"
+msgstr "febreiro"
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ir � data"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ir a hoxe"
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "S�b"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "January"
+msgstr "xaneiro"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Non foi posible inicializar Bonobo"
+msgid "July"
+msgstr "xullo"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "June"
+msgstr "xu�o"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "March"
+msgstr "marzo"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "May"
+msgstr "Luns"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "November"
+msgstr "novembro"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "October"
+msgstr "outubro"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "September"
+msgstr "setembro"
+
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "D�a actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto est� mal, o %a � o nome de semana
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Previsualizar da Impresi�n"
 
@@ -1967,10 +3191,84 @@ msgstr "Previsualizar da Impresi�n"
 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
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expresi�n regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expresi�n regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -2047,79 +3345,210 @@ msgstr "O programa movemail fallou: %s"
 msgid "(Unknown error)"
 msgstr "(Erro desco�ecido)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 #, 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
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir axenda"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "O servidor rexeitou o nome de usuario"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autenticaci�n"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Erro cargando a informaci�n do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Erro cargando a informaci�n do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Esta opci�n conectarase � servidor IMAP usando autenticaci�n Kerberos 4."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Esta opci�n conectarase � servidor IMAP usando autenticaci�n Kerberos 4."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Non foi posible crear unha canalizaci�n: %s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-search-private.c:105
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Erro escribindo � caixa de correo temporal: %s"
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, 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:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co cami�o"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:322
 #, 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:390
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2128,32 +3557,32 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Tarefa"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "O URL `%s' non cont�n ning�n protocolo"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, 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:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "O n�mero de porto no URL `%s' non � num�rico"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "Non foi posible crear unha canalizaci�n: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta non agardada do servidor IMAP: %s"
+msgid "No such message: %s"
+msgstr "Re-enviar esta mensaxe"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -2165,7 +3594,7 @@ msgstr "Resposta non agardada do servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
@@ -2183,13 +3612,18 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Examinando as carpetas en \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2201,27 +3635,44 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Esta opci�n conectarase � servidor IMAP usando autenticaci�n Kerberos 4."
+"Non foi posible conectarse � servidor POP.\n"
+"Non se soporta o mecanismo de autenticaci�n solicitado."
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Autenticaci�n"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2232,7 +3683,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
@@ -2262,50 +3713,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' non � un ficheiro regular."
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
@@ -2344,8 +3787,8 @@ msgstr "Re-enviar esta mensaxe"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -2354,15 +3797,15 @@ msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A carpeta `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -2371,19 +3814,19 @@ msgstr ""
 "Non foi posible crear a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "`%s' non � un directorio."
@@ -2417,7 +3860,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2426,7 +3869,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2435,14 +3878,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non � un ficheiro regular."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2451,75 +3894,88 @@ msgstr ""
 "Non foi posible borrar a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "A carpeta `%s' non est� baleira. Non borrada."
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non � posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Non � posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non � posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
@@ -2530,7 +3986,7 @@ msgstr "Erro desco�ecido: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non � un directorio."
@@ -2603,16 +4059,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
@@ -2630,7 +4096,22 @@ msgstr ""
 "recibir correo de certos provedores de correo web, e de sistemas de email "
 "propietarios."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
+"recibir correo de certos provedores de correo web, e de sistemas de email "
+"propietarios."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -2638,7 +4119,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:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -2648,28 +4129,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:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 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:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, 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:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, 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:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2678,12 +4159,12 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Desco�ecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -2691,7 +4172,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:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2700,12 +4181,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -2748,29 +4230,161 @@ msgstr "Non foi posible executar %s: correo non enviado."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "o sendmail sa�u con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Non foi posible enviar a mensaxe: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 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.glade.h:55
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Editar Mensaxe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Agochar"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Non se indicou un contrasinal."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Non foi posible conectarse � servidor POP.\n"
+"Non se soporta o mecanismo de autenticaci�n solicitado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Autenticaci�n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autenticaci�n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -2779,121 +4393,112 @@ 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:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, 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:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Non foi posible executar %s: correo non enviado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, 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:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, 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:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
@@ -2919,19 +4524,15 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "anexo"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Inclu�r un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Quitar"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
@@ -2944,40 +4545,80 @@ msgstr "Engadir anexo..."
 msgid "Attach a file to the message"
 msgstr "Inclu�r un ficheiro como anexo na mensaxe"
 
-#: 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-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "anexo"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Propiedades do anexo"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Nome de ficheiro:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "anexo"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "Tipo MIME:"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "Autor"
+
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
-#: 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"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Responder-A:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 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:328
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2985,15 +4626,7 @@ msgstr ""
 "Introduza os enderezos que recibir�n unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o asunto da mensaxe"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3002,38 +4635,26 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Gardando as modificaci�ns da mensaxe..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Gardar as modificaci�ns da mensaxe..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3043,27 +4664,27 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Non � un ficheiro normal."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 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:961
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3071,22 +4692,259 @@ msgstr ""
 "O ficheiro � moi longo (m�is de 100K).\n"
 "�Est� seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "_Atallo da barra do Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Enderezo"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Sen Informaci�n"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: 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."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Recibindo correo de %s"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Pechar"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mover para a Carpeta"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ir � elemento anterior"
+
+#: executive-summary/component/e-summary-url.c:79
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ir � elemento seguinte"
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configurar Carpeta"
+
+#: executive-summary/component/e-summary.c:918
+#, 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:932
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "_Resume"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+#, fuzzy
+msgid "Error"
+msgstr "Sen erro"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update every "
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minutos"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "ano"
@@ -3127,10 +4985,6 @@ msgstr "horas"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "segundo"
@@ -3193,41 +5047,20 @@ msgstr "agora"
 msgid "<click here to select a date>"
 msgstr "<prema aqu� para seleccionar unha data>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Engadir Regra de Filtrado"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar Regra de Filtrado"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-#, fuzzy
-msgid "outgoing"
-msgstr ""
-"Entrante\n"
-"Sa�nte\n"
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Editar Filtros"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Reglas de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Engadir acci�n"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Eliminar acci�n"
 
@@ -3237,7 +5070,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
@@ -3249,7 +5082,7 @@ msgstr "Introduza o URI da carpeta"
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3258,418 +5091,532 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Sen_t�tulo"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 #, fuzzy
 msgid "Replied to"
 msgstr "Responder a Todos"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "Refacer"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:5
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrante\n"
+"Sa�nte\n"
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid "Outgoing"
+msgstr ""
+"Entrante\n"
+"Sa�nte\n"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+msgid "Virtual Folders"
+msgstr "Carpetas Virtuais"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Non se atopou a carpeta especificada"
+
+#: filter/filter.glade.h:12
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Fontes de Correo"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Crear unha nova carpeta"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar Puntuaci�n"
 
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar � Carpeta"
-
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recepci�n"
+#, fuzzy
+msgid "Attachments"
+msgstr "anexo"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de env�o"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "cont�n"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expresi�n"
+msgid "Copy to Folder"
+msgstr "Copiar � Carpeta"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar � Enderezo"
+msgid "Date received"
+msgstr "Data de recepci�n"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
+msgid "Date sent"
+msgstr "Data de env�o"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not contain"
+msgstr "non cont�n"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
+msgid "does not end with"
+msgstr "non termina en"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
+msgid "does not exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "does not sound like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+msgid "does not start with"
+msgstr "non empeza por"
 
-#: 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:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Autor"
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
+msgid "Exist"
+msgstr "_Sa�r"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "Expression"
+msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "Reenviar � Enderezo"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is"
+msgstr "�"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "� maior que"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
+msgid "is less than"
+msgstr "� menor que"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
+msgid "is not"
+msgstr "non �"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "cont�n"
+#, fuzzy
+msgid "Mailing list"
+msgstr "lista de correo %s"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non cont�n"
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non termina en"
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non existe"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non empeza por"
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina en"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "� maior que"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "� menor que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non �"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "�"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Puntuaci�n"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Asunto"
+
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "foi anterior a"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Engadir Regra"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
+msgstr "Puntuaci�n"
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:219
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccionar Carpeta"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "O corpo ou o asunto conte�en"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "O corpo cont�n"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "O asunto cont�n"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "O corpo non cont�n"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "O asunto non cont�n"
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Editar"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Responder � Autor"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar � Carpeta"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 #, 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%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"
+#: mail/folder-browser.c:705
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "Non foi posible iniciar wombat"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formato"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo de fonte de Novas:"
+
+#: 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/mail-accounts.c:115
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "maildir"
+msgstr "Correo Electr�nico 2"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Eliminar"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+"�Est� seguro de que quere\n"
+"borrar este contacto?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+"�Est� seguro de que quere\n"
+"borrar este contacto?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 #, fuzzy
 msgid "Evolution Account Manager"
 msgstr "Xesti�n e Contas"
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 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
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Instalaci�n de Evolution"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3685,12 +5632,16 @@ msgstr "O asunto � %s"
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Engadir Regra de Filtrado"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3698,7 +5649,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3706,21 +5657,17 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 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:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3728,31 +5675,36 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 #, 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
+#: mail/mail-callbacks.c:316
 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:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3760,11 +5712,11 @@ msgstr ""
 "S� pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3772,17 +5724,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1088
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3791,22 +5743,308 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:2
+msgid "Account Information"
+msgstr "Informaci�n de Contas"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "Account Management"
+msgstr "Xesti�n e Contas"
+
+#: mail/mail-config.glade.h:5
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Authentication"
+msgstr "Autenticaci�n"
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autenticaci�n:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Probar Configuraci�n"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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 ""
+"A configuraci�n do correo electr�nico est� completa.\n"
+"Prema \"Finalizar\" para gardar a nova configuraci�n"
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Eliminar"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "mes"
+
+#: mail/mail-config.glade.h:23
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "Enderezo de email:"
+
+#: mail/mail-config.glade.h:25
+msgid "Evolution Mail Configuration"
+msgstr "Configuraci�n de Correo do Evolution"
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Identidade"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config.glade.h:35
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Mail Account"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr "Configuraci�n do Correo"
+
+#: mail/mail-config.glade.h:38
+msgid "Mail Configuration Druid"
+msgstr "Axudante da Configuraci�n do Correo"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "Marcar mensaxe como lida [ms]: "
+
+#: mail/mail-config.glade.h:42
+msgid "News"
+msgstr "Novas"
+
+#: mail/mail-config.glade.h:44
+msgid "Optional"
+msgstr "Opcional"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Organizaci�n:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Enderezo de email:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Required"
+msgstr "Persoas _Requiridas"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Save password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr "Configuraci�n do Servidor"
+
+#: mail/mail-config.glade.h:63
+msgid "Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config.glade.h:64
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "O servidor SMTP require autenticaci�n"
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "O servidor SMTP require autenticaci�n"
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Transparente"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Autenticaci�n"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: mail/mail-config.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.glade.h:75
+#, fuzzy
+msgid "User Information"
+msgstr "Sen Informaci�n"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr "�Benvido � axudante da Configuraci�n de Correo do Evolution!"
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Editar"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "minutos"
+
+#: mail/mail-config-druid.c:421
 #, 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
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "Nome:"
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3814,173 +6052,155 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Non foi posible escribir os datos: %s"
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Responder-A:"
+#: mail/mail-format.c:704
+#, fuzzy
+msgid "Loading message content"
+msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Non existe a carpeta `%s'."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir en %s..."
+
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configurar Carpeta"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "Creando unha nova carpeta"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Crear unha nova carpeta"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear a carpeta `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -3989,7 +6209,7 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -3998,471 +6218,523 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 #, fuzzy
 msgid "Working"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "Recibindo correo de %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Recibir correo de %s"
-
-#: 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:430
-msgid "Filtering email on demand"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: 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:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensaxes de \"%s\" a \"%s\""
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: 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:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Mover mensaxe(s) a"
 
-#: 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:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Sen descrici�n)"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizando \"%s\""
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, 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:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, 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:1935
+#: mail/mail-ops.c:1672
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1686
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-ops.c:1760
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Gardar Anexo"
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:1775
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1803
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+msgid "Could not write data: %s"
+msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Non foi posible crear a caixa de di�logo."
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "Cancelar"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "O usuario cancelou a consulta."
+#: mail/mail-send-recv.c:231
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Enviando Correo"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+#: mail/mail-send-recv.c:234
+#, fuzzy
+msgid "Receiving"
+msgstr "Data de recepci�n"
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "Examinando %s"
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
+msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "Enviando \"%s\""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "Escribindo a mensaxe %d de %d"
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancelar"
 
-#: mail/mail-tools.c:347
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "% Comp_leta:"
+
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
-msgstr "Gardando as modificaci�ns de %s"
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Non se pode abrir a localizai�n `%s':\n"
-"%s"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder � autor desta mensaxe"
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a t�dolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Non foi posible enviar a mensaxe: %s"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Editar Mensaxe"
+
+#: mail/message-list.c:952
 #, 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:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 #, fuzzy
 msgid "<unknown>"
 msgstr "Desco�ecido"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "anexo"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Pegar"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepci�n"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "To"
 msgstr "A:"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "Size"
 msgstr "Tama�o:"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:92
 #, 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
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 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
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 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
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, 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
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetas"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Puntuaci�n"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: mail/subscribe-dialog.c:280
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome de ficheiro:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Carpetas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Non hai espacio dabondo para crear a carpeta"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
 #, c-format
-msgid "Get store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:309
 #, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Non hai novo correo en %s."
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "Movendo"
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:327
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:342
 #, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid "Error loading %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome de ficheiro:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Ficheiro de sinatura:"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "Nome de ficheiro:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Instalaci�n de Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Instalaci�n de Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -4490,7 +6762,8 @@ msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con �xito."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que � a primeira vez que executa Evolution."
 
 #: shell/e-setup.c:190
@@ -4540,7 +6813,7 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4549,11 +6822,11 @@ msgstr ""
 "Non se pode crear a carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "O nome de carpeta indicado non � v�lido."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear unha nova carpeta"
 
@@ -4565,7 +6838,7 @@ msgstr ""
 "O tipo da carpeta seleccionada non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nova..."
 
@@ -4573,20 +6846,20 @@ msgstr "Nova..."
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4596,24 +6869,24 @@ msgstr ""
 "en grupo para xesti�n de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Ir � carpeta..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
@@ -4623,7 +6896,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1242
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4707,89 +6980,95 @@ msgstr "Activar este atallo"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non � v�lido"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste almacenamento"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Non se pode inicializar a shell de Evolution."
+
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4797,1790 +7076,2112 @@ msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Desactivar."
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo"
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Nova Cita"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada de _Xornal"
+msgid "Create new contact"
+msgstr "Crear un novo contacto"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
+msgstr "Borrar un contacto"
 
-#: 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:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Buscar"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
+msgstr "Buscar un contacto"
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Definir E_stilos de Impresi�n"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: _Enviar"
+msgid "New contact"
+msgstr "Ver t�dolos contactos"
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Gardar Ane_xos..."
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para a Carpeta..."
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
+msgstr "Imprimir contactos"
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_iar � Carpeta..."
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+msgid "Stop"
+msgstr "Parar"
 
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Configuraci�n da P�xina:"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
+msgstr "Parar a Carga"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualizaci�n da Impresi�n"
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
+msgstr "Ver Todos"
 
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Pegar _Especial..."
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
+msgstr "Ver t�dolos contactos"
 
-#: ui/evolution-contact-editor.xml:68
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Marcar como _non Lida"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Obxecto"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elemento"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Elemento _non Lido"
+msgid "_Addressbook Sources..."
+msgstr "Engadir Fonte"
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pri_meiro elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Derradeiro Elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Est�ndar"
-
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: Fo_rmato"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
+msgid "_Contact"
+msgstr "_Contactos..."
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
-msgid "Ne_xt"
-msgstr "Seguinte"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: 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-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Obxecto..."
+msgid "_Print..."
+msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr "_Buscar contactos"
 
-#: 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-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Dese�ar un Formulario..."
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Ferramentas"
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _Formulario..."
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 D�as"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar Formulario Como..."
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Preferencias da Axenda"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de Script"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortograf�a..."
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
+msgstr "Crear unha nova axenda"
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Formularios"
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "D�a"
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "FIXME: _Contacto"
+msgid "Go To"
+msgstr "Ir para"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
+msgstr "Ir para atr�s no tempo"
 
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: _Contacto"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go forward in time"
+msgstr "Ir para diante no tempo"
 
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar unha mensaxe sen asunto"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
+msgstr "Ir para a data especificada"
 
-#: ui/evolution-contact-editor.xml:147
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: _Contacto"
+msgid "Go to present time"
+msgstr "Ir � elemento seguinte"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Mes"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Ortograf�a..."
+msgid "New Appointment"
+msgstr "Nova cita..."
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: _Contacto"
+msgid "Next"
+msgstr "Seguinte"
 
-#: ui/evolution-contact-editor.xml:150
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Entrada de _Xornal"
+msgid "Open Calendar"
+msgstr "_Abrir axenda"
 
-#: ui/evolution-contact-editor.xml:152
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: Cop_iar � Carpeta..."
+msgid "Prev"
+msgstr "Previsualizaci�n:"
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: Enviar _Mensaxe"
+msgid "Print calendar"
+msgstr "Imprimir axenda"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Enviar _Mensaxe"
+msgid "Print this Calendar"
+msgstr "Imprimir esta axenda"
 
-#: ui/evolution-contact-editor.xml:156
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 #, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Reenviar como v_Calendar"
+msgid "Save As"
+msgstr "Gardar _Como"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Reenviar"
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "Amosar un d�a"
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "_Formatar"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "Amosar un mes"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Amosar unha semana"
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "Acci�_ns"
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "Amosar a semana laboral"
 
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Anterior"
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Hoxe"
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir � elemento anterior"
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "FIXME: _Nota"
+msgid "_Appointment"
+msgstr "Citas:"
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir � elemento seguinte"
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Novo"
 
-#. 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-calendar.xml.h:34
+msgid "_Open Calendar"
+msgstr "_Abrir axenda"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gardar _Como..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Borrar este elemento"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "F�ra da Oficina"
+#: ui/evolution-contact-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Eliminar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sen Informaci�n"
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
+msgstr "Axuda"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "_Configuraci�n da Impresi�n..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opci�ns"
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr "Imprimir este elemento"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Amosar _S� as Horas de Traballo"
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr "Imprimir..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+msgid "Save _As..."
+msgstr "Gardar _Como..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr "Gardar o contacto e pechar a caixa de di�logo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Ver a axuda online"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_T�dalas Persoas e Recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "T�dalas _Persoas e Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reuni�n:"
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Enviar unha mensaxe sen asunto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reuni�n:"
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Ficheiro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr "_Gardar"
 
-#. 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:1 ui/evolution-task-editor-dialog.xml.h:1
+msgid "About this application"
+msgstr "Acerca desta aplicaci�n"
 
-#. 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:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr "Acerca de..."
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
+msgstr "Acci�_ns"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#, fuzzy
+msgid "Address _Book... (FIXME)"
+msgstr "FIXME: _Libro de enderezos..."
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoxe"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+msgid "C_lear"
+msgstr "_Limpar"
 
-#. 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:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "Co_rtar"
 
-#. 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
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Buscar"
+msgid "Chec_k Names (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "�Borrar Contacto?"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+msgid "Clear"
+msgstr "Limpar"
 
-#~ msgid "Address _2:"
-#~ msgstr "Enderezo _2:"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+msgid "Clear the selection"
+msgstr "Limpar a selecci�n"
 
-#~ msgid "Canada"
-#~ msgstr "Canad�"
+#: ui/evolution-event-editor.xml.h:11
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
 
-#~ msgid "Countr_y:"
-#~ msgstr "_Pa�s:"
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#, fuzzy
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Copiar � Carpeta"
 
-#~ msgid "Finland"
-#~ msgstr "Finlandia"
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Copiar"
 
-#~ msgid "USA"
-#~ msgstr "Estados Unidos"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr "Copiar a selecci�n"
 
-#~ msgid "_Address:"
-#~ msgstr "_Enderezo:"
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Cortar"
 
-#~ msgid "_City:"
-#~ msgstr "_Cidade:"
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr "Cortar a selecci�n"
 
-#~ msgid "_PO Box:"
-#~ msgstr "_Apdo. de Correos:"
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
 
-#~ msgid "_State/Province:"
-#~ msgstr "E_stado/Provincia:"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr "Envorcar XML"
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "C�digo _Postal:"
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr "Envorcar a descrici�n Xml da Interface"
 
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Engadir Fonte"
-
-#~ msgid "Find..."
-#~ msgstr "Buscar..."
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Seleccionar un nome da Lista:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
+msgid "For_ward (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
 
-#~ msgid "f"
-#~ msgstr "f"
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
+msgstr "Ir � elemento seguinte"
 
-#~ msgid "g"
-#~ msgstr "g"
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "Ir � elemento anterior"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#, fuzzy
+msgid "In_complete Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "i"
-#~ msgstr "i"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
+msgstr "Modificar as propiedades do ficheiro"
 
-#~ msgid "j"
-#~ msgstr "j"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr "Se_guinte"
 
-#~ msgid "k"
-#~ msgstr "k"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+#, fuzzy
+msgid "Paste"
+msgstr "_Pegar"
 
-#~ msgid "l"
-#~ msgstr "l"
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
 
-#~ msgid "m"
-#~ msgstr "m"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "An_terior"
 
-#~ msgid "n"
-#~ msgstr "n"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+#, fuzzy
+msgid "Previous"
+msgstr "An_terior"
 
-#~ msgid "o"
-#~ msgstr "o"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Previsualizar da Impresi�n"
 
-#~ msgid "p"
-#~ msgstr "p"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr "_Configuraci�n da Impresi�n..."
 
-#~ msgid "q"
-#~ msgstr "q"
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+msgstr "Configuraci�n da Impresi�n"
 
-#~ msgid "r"
-#~ msgstr "r"
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Gardar"
 
-#~ msgid "s"
-#~ msgstr "s"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de di�logo"
 
-#~ msgid "t"
-#~ msgstr "t"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
 
-#~ msgid "u"
-#~ msgstr "u"
+#: ui/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "FIXME: _Programar Reuni�n"
 
-#~ msgid "v"
-#~ msgstr "v"
+#: ui/evolution-event-editor.xml.h:47
+#, fuzzy
+msgid "Schedule some sort of a meeting"
+msgstr "FIXME: Programar Reuni�n"
 
-#~ msgid "w"
-#~ msgstr "w"
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "x"
-#~ msgstr "x"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr "Seleccionar todo"
 
-#~ msgid "y"
-#~ msgstr "y"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opci�ns de p�xina para a impresora actual"
 
-#~ msgid "z"
-#~ msgstr "z"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 ptos. Tahoma"
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+msgid "_About..."
+msgstr "_Acerca de..."
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 ptos. Tahoma"
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Pechar"
 
-#~ msgid "Body"
-#~ msgstr "Corpo"
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Bottom:"
-#~ msgstr "Inferior:"
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "_Copiar"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensi�ns:"
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr "_Depuraci�n"
 
-#~ msgid "Font..."
-#~ msgstr "Fonte..."
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+msgid "_Help"
+msgstr "A_xuda"
 
-#~ msgid "Fonts"
-#~ msgstr "Fontes"
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Format"
-#~ msgstr "Formato"
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Headings"
-#~ msgstr "Cabeceiras"
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#~ msgid "Height:"
-#~ msgstr "Altura:"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Landscape"
-#~ msgstr "Horizontal"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "_Mover para a Carpeta"
 
-#~ msgid "Left:"
-#~ msgstr "Esquerda:"
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Pestanas coas letras no lateral"
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "_Pegar"
 
-#~ msgid "Margins"
-#~ msgstr "Marxes"
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Imprimir"
 
-#~ msgid "Number of columns:"
-#~ msgstr "N�mero de columnas:"
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#~ msgid "Options"
-#~ msgstr "Opci�ns"
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Orientation"
-#~ msgstr "Orientaci�n"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Page"
-#~ msgstr "P�xina"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Paper"
-#~ msgstr "Papel"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "Engadir Fonte"
 
-#~ msgid "Paper source:"
-#~ msgstr "Orixe do papel:"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
-#~ msgid "Portrait"
-#~ msgstr "Vertical"
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "Crear un novo contacto"
 
-#~ msgid "Preview:"
-#~ msgstr "Previsualizaci�n:"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Imprimir usando sombreado gris"
+#: ui/evolution-executive-summary.xml.h:5
+#, fuzzy
+msgid "New Mail"
+msgstr "Recibir Correo"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Invertir nas p�xinas pares"
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
+msgstr "Redactar"
 
-#~ msgid "Right:"
-#~ msgstr "Dereita:"
+#: ui/evolution-mail.xml.h:3
+msgid "Compose a new message"
+msgstr "Redactar unha nova mensaxe"
 
-#~ msgid "Sections:"
-#~ msgstr "Secci�ns:"
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
+msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#~ msgid "Shading"
-#~ msgstr "Sombreado"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Carpetas Virtuais"
 
-#~ msgid "Start on a new page"
-#~ msgstr "Iniciar nunha nova p�xina"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
-#~ msgid "Style name:"
-#~ msgstr "Nome do estilo:"
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "D�as baleiros:"
 
-#~ msgid "Top:"
-#~ msgstr "Superior:"
+#: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Responder � Autor"
 
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Destinatarios"
 
-#~ msgid "Width:"
-#~ msgstr "Largura:"
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Asunto"
 
-#~ msgid "label26"
-#~ msgstr "label26"
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
 
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Axenda"
+msgid "Forward As"
+msgstr "Re-enviar"
 
+#: ui/evolution-mail.xml.h:18
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Conducto de Axenda de Evolution"
+msgid "Full Headers"
+msgstr "Nome Completo:"
 
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
-#~ "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
-
-#~ msgid "Edit appointment"
-#~ msgstr "Editar cita"
+msgid "Hide S_elected Messages"
+msgstr "Imprimir a mensaxe seleccionada"
 
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Tempo de adiamento (minutos)"
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Borrar Mensaxe"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minutos"
+#: ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Mensaxe reenviada - %s"
 
-#~ msgid "10 minutes"
-#~ msgstr "10 minutos"
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
+msgstr ""
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (am/pm)"
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Descrici�n:"
 
-#~ msgid "15 minutes"
-#~ msgstr "15 minutos"
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Marcar como _Lida"
 
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Marcar como _Lida"
 
-#~ msgid "30 minutes"
-#~ msgstr "30 minutos"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Marcar como _non Lida"
 
-#~ msgid "60 minutes"
-#~ msgstr "60 minutos"
+#: ui/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Message _Display"
+msgstr "Corpo da Mensaxe"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Alarmas Sonoras"
+#: ui/evolution-mail.xml.h:28
+msgid "Move"
+msgstr "Mover"
 
-#~ msgid "Calendar"
-#~ msgstr "Axenda"
+#: ui/evolution-mail.xml.h:29
+msgid "Move message to a new folder"
+msgstr "Mover mensaxe a unha nova carpeta"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferencias da Axenda"
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr "Imprimir mensaxe na impresora"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "No_tas:"
 
-#~ msgid "End of day:"
-#~ msgstr "Final do d�a:"
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
 
-#~ msgid "First day of week:"
-#~ msgstr "Primeiro d�a da semana:"
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Responder a _Todos"
 
-#~ msgid "Show week numbers"
-#~ msgstr "Amosar n�meros de semana"
+#: ui/evolution-mail.xml.h:43
+#, fuzzy
+msgid "S_ource"
+msgstr "Fontes"
 
-#~ msgid "Start of day:"
-#~ msgstr "Inicio do d�a:"
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Time format:"
-#~ msgstr "Formato da hora:"
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmas Visuais"
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "seconds."
-#~ msgstr "segundos."
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#~ msgid "% Comp_lete:"
-#~ msgstr "% Comp_leta:"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Ver Todos"
 
-#~ msgid "C_lassification:"
-#~ msgstr "C_lasificaci�n:"
+#: ui/evolution-mail.xml.h:50
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Mensaxe reenviada - %s"
 
-#~ msgid "High"
-#~ msgstr "Alta"
+#: ui/evolution-mail.xml.h:51
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Responder � Autor"
 
-#~ msgid "In Progress"
-#~ msgstr "En Progreso"
+#: ui/evolution-mail.xml.h:52
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Destinatarios"
 
-#~ msgid "Low"
-#~ msgstr "Baixa"
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Asunto"
 
-#~ msgid "Normal"
-#~ msgstr "Normal"
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
-#~ msgid "Not Started"
-#~ msgstr "Non Iniciada"
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Carpetas Virtuais"
 
-#~ msgid "Task"
-#~ msgstr "Tarefa"
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Acci�ns"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactos..."
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr "_Aplicar Filtros"
 
-#~ msgid "_Priority:"
-#~ msgstr "_Prioridade:"
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Redactar"
 
-#~ msgid "_Status:"
-#~ msgstr "_Estado:"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copiar � Carpeta"
 
-#~ msgid "task-editor-dialog"
-#~ msgstr "di�logo-editor-tarefas"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
 
-#~ msgid "A_ll day event"
-#~ msgstr "Evento de d�a _completo"
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr ""
 
-#~ msgid "Days"
-#~ msgstr "D�as"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtros de Correo..."
 
-#~ msgid "Every"
-#~ msgstr "Cada"
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Carpeta"
 
-#~ msgid "Exceptions"
-#~ msgstr "Excepci�ns"
+#: ui/evolution-mail.xml.h:65
+msgid "_Forward"
+msgstr "_Reenviar"
 
-#~ msgid "Hours"
-#~ msgstr "Horas"
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter Selecci�n"
 
-#~ msgid "Mail _to:"
-#~ msgstr "Enviar _a:"
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Configuraci�n"
 
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Previsualizaci�n:"
+msgid "_Message Hiding"
+msgstr "_Mensaxe"
 
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vado"
+#: ui/evolution-mail.xml.h:70
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "_Mover para a Carpeta"
 
-#~ msgid "Pu_blic"
-#~ msgstr "P�_blico"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Abrir a tarefa"
 
-#~ msgid "Su_mmary:"
-#~ msgstr "_Resume:"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#~ msgid "Time"
-#~ msgstr "Hora"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
 
-#~ msgid "_Audio"
-#~ msgstr "_Audio"
+#: ui/evolution-mail.xml.h:77
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Borrar"
 
-#~ msgid "_Confidential"
-#~ msgstr "_Confidencial"
+#: ui/evolution-message-composer.xml.h:1
+#, fuzzy
+msgid "Attach"
+msgstr "Inclu�r un ficheiro"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correo"
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+#, fuzzy
+msgid "Close the current file"
+msgstr "Gardar o ficheiro actual"
 
-#~ msgid "_Program"
-#~ msgstr "_Programa"
+#: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Mensaxe cifrada"
 
-#~ msgid "_Run program:"
-#~ msgstr "_Executar programa:"
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "_Formatar"
 
-#~ msgid "_Start time:"
-#~ msgstr "Hora de _comezo:"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
 
-#~ msgid "_Starting date:"
-#~ msgstr "Data de _comezo:"
+#: ui/evolution-message-composer.xml.h:8
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Inclu�r un ficheiro como anexo na mensaxe"
 
-#~ msgid "day(s)"
-#~ msgstr "d�a(s)"
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
 
-#~ msgid "event-editor-dialog"
-#~ msgstr "di�logo-editor-eventos"
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
+msgid "Open a file"
+msgstr "Abrir ficheiro"
 
-#~ msgid "label21"
-#~ msgstr "label21"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
 
-#~ msgid "month(s)"
-#~ msgstr "mes(es)"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
 
-#~ msgid "week(s)"
-#~ msgstr "semana(s)"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
 
-#~ msgid "year(s)"
-#~ msgstr "ano(s)"
+#: ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Ir � carpeta..."
 
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Non foi posible crear un calendario en `%s'"
+#: ui/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Ir � carpeta..."
 
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "abril"
+msgid "Save the current file with a different name"
+msgstr "Gardar o ficheiro actual"
 
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-#~ msgid "August"
-#~ msgstr "agosto"
+msgid "Save the message in a specified folder"
+msgstr "Mover mensaxe a unha nova carpeta"
 
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-#~ msgid "December"
-#~ msgstr "decembro"
+msgid "Send"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
-#~ msgid "February"
-#~ msgstr "febreiro"
+msgid "Send _Later"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Ir � data"
+msgid "Send _later"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Ir a hoxe"
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensaxes en formato HTML"
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "January"
-#~ msgstr "xaneiro"
+msgid "Send the message later"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "July"
-#~ msgstr "xullo"
+msgid "Send the message now"
+msgstr "Enviar mensaxes en formato HTML"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "June"
-#~ msgstr "xu�o"
+msgid "Send this message now"
+msgstr "Borrar esta mensaxe"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "marzo"
+msgid "Show / hide attachments"
+msgstr "Gardar Anexo"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Luns"
+msgid "Show _attachments"
+msgstr "anexo"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "November"
-#~ msgstr "novembro"
+msgid "Show attachments"
+msgstr "anexo"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "outubro"
+msgid "Sign this message with your PGP key"
+msgstr "Enviando unha mensaxe sen asunto"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-#~ msgid "September"
-#~ msgstr "setembro"
+msgid "Toggles whether the From chooser is displayed"
+msgstr "O URI que amosar� o navegador de carpetas"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
 
-#~ msgid "Attachment properties"
-#~ msgstr "Propiedades do anexo"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
 
-#~ msgid "File name:"
-#~ msgstr "Nome de ficheiro:"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "MIME type:"
-#~ msgstr "Tipo MIME:"
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Inserir"
 
-#~ msgid "Filter Rules"
-#~ msgstr "Reglas de Filtrado"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:49
 #, fuzzy
-#~ msgid "Incoming"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Sa�nte\n"
+msgid "_Open..."
+msgstr "Abrir..."
 
+#: ui/evolution-message-composer.xml.h:50
 #, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Sa�nte\n"
+msgid "_Reply-To Field"
+msgstr "Responder-A:"
 
-#~ msgid "Virtual Folders"
-#~ msgstr "Carpetas Virtuais"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
 
-#~ msgid "Save"
-#~ msgstr "Gardar"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Engadir a carpeta � s�a lista de carpetas subscritas"
 
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Ver Todos"
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Carpeta"
 
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Agochar"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr "Actualizar Lista"
 
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Eliminar"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr "Actualizar Lista de Carpetas"
 
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Asunto"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Eliminar a carpeta da s�a lista de carpetas subscritas"
 
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Responder � Autor"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr "Subscribir"
 
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Editar Mensaxe"
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr "Desubscribir"
 
+#: ui/evolution-task-editor-dialog.xml.h:5
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "O asunto � %s"
+msgid "Assig_n Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Non foi posible iniciar wombat"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr "Buscar Novamente"
 
+#: ui/evolution-task-editor-dialog.xml.h:29
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Formato"
+msgid "Meeting Re_quest (FIXME)"
+msgstr "FIXME: Solicitude de _Tarefa"
 
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr "Refacer"
+
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr "Refacer a acci�n desfeita"
+
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr "Substitu�r"
+
+#: ui/evolution-task-editor-dialog.xml.h:46
+msgid "Replace a string"
+msgstr "Substitu�r unha cadea"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
 #, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Tipo de fonte de Novas:"
+msgid "Reply to A_ll (FIXME)"
+msgstr "Responder a Todos"
 
+#: ui/evolution-task-editor-dialog.xml.h:48
 #, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+msgid "S_end Status Report (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Non ten ningunha fonte de correo configurada"
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:54
 #, fuzzy
-#~ msgid "Account"
-#~ msgstr "Contas"
+msgid "Save the task and close the dialog box"
+msgstr "Gardar o contacto e pechar a caixa de di�logo"
 
-#~ msgid "Account Information"
-#~ msgstr "Informaci�n de Contas"
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr "Buscar novamente a mesma cadea"
 
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propiedades do anexo"
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr "Buscar unha cadea"
 
-#~ msgid "Authentication"
-#~ msgstr "Autenticaci�n"
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr "Desfacer"
 
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticaci�n:"
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr "Desfacer a �ltima acci�n"
+
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
 
+#: ui/evolution-task-editor-dialog.xml.h:77
 #, fuzzy
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Noraboa, a configuraci�n do correo est� completa."
+msgid "_Mark Complete (FIXME)"
+msgstr "Marcar como Completa"
 
+#: ui/evolution-task-editor-dialog.xml.h:84
 #, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
+msgid "_Reply (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "mes"
+msgid "Create a new task"
+msgstr "Crear un novo contacto"
 
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Enderezo de Email:"
+msgid "New Task"
+msgstr "Tarefa"
 
-#~ msgid "Email Address:"
-#~ msgstr "Enderezo de Email:"
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuraci�n de Correo do Evolution"
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Tasks Preferences..."
+msgstr "Preferencias da Axenda..."
 
-#~ msgid "Full Name:"
-#~ msgstr "Nome Completo:"
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Tarefa"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nome de usuario:"
+msgid "About Evolution..."
+msgstr "_Acerca do Evolution..."
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Close this window"
+msgstr "Pechar esta cita"
 
-#~ msgid "Identity"
-#~ msgstr "Identidade"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
+#: ui/evolution.xml.h:5
 #, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
+msgid "Customize"
+msgstr "FIXME: _Personalizar..."
 
-#~ msgid "Mail"
-#~ msgstr "Correo"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Contas"
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr "Visualizar unha carpeta diferente"
 
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuraci�n do Correo"
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr "_Sa�r"
 
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Axudante da Configuraci�n do Correo"
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr "_Atallo da barra do Evolution"
 
-#~ msgid "News"
-#~ msgstr "Novas"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr "Sa�r do programa"
 
-#~ msgid "Optional"
-#~ msgstr "Opcional"
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr "_Iniciaci�n"
 
-#~ msgid "Organization:"
-#~ msgstr "Organizaci�n:"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#~ msgid "Reply-to:"
-#~ msgstr "Responder-a:"
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr "Amosar informaci�n sobre o Evolution"
 
+#: ui/evolution.xml.h:15
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "Persoas _Requiridas"
+msgid "Submit Bug Report"
+msgstr "_Enviar un Informe de Erro"
 
+#: ui/evolution.xml.h:16
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gardar como VCard"
+msgid "Submit _Bug Report"
+msgstr "_Enviar un Informe de Erro"
 
+#: ui/evolution.xml.h:17
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro de sinatura:"
+msgid "Submit bug report using Bug Buddy."
+msgstr "Enviar un informe de erro usando o Bug Buddy"
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
 
+#: ui/evolution.xml.h:19
 #, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Enviando Correo"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Eliminar este atallo da barra de atallos"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Configuraci�n do Servidor"
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr "Uso do Xestor de Co_ntactos"
 
-#, fuzzy
-#~ msgid "Server Timeouts"
-#~ msgstr "Tipo de Servidor: "
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr "Uso da _Axenda"
 
-#~ msgid "Server Type: "
-#~ msgstr "Tipo de Servidor: "
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr "Uso do Cliente de _Correo"
 
+#: ui/evolution.xml.h:23
 #, fuzzy
-#~ msgid "Server requires authentication"
-#~ msgstr "O servidor SMTP require autenticaci�n"
+msgid "Work Offline"
+msgstr "Movendo"
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr "_Acerca do Evolution..."
 
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
+msgid "_Folder Bar"
+msgstr "_Carpeta"
 
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro de sinatura:"
+#: ui/evolution.xml.h:32
+msgid "_Go to Folder..."
+msgstr "_Ir para a Carpeta..."
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro de sinatura:"
+msgid "_Import file..."
+msgstr "_Propiedades..."
 
-#~ msgid "Sources"
-#~ msgstr "Fontes"
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr "�_ndice"
 
+#: ui/evolution.xml.h:36
 #, fuzzy
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "O servidor SMTP require autenticaci�n"
+msgid "_Mail message"
+msgstr "_Mensaxe"
 
+#: ui/evolution.xml.h:38
 #, fuzzy
-#~ msgid "Type"
-#~ msgstr "Tipo:"
+msgid "_New Folder"
+msgstr "Nova VFolder"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Sen Informaci�n"
+msgid "_Shortcut Bar"
+msgstr "Amosar a Barra de _Atallos"
 
-#~ msgid "Username:"
-#~ msgstr "Nome de usuario:"
+#. 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 "Welcome to the Evolution Mail Configuration Druid.\n"
-#~ msgstr "�Benvido � axudante da Configuraci�n de Correo do Evolution!"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupado"
 
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minutos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "F�ra da Oficina"
 
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Sen Informaci�n"
 
-#~ msgid "Email address:"
-#~ msgstr "Enderezo de email:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#~ msgid "Signature File"
-#~ msgstr "Ficheiro de Sinatura"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opci�ns"
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Amosar _S� as Horas de Traballo"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detectar tipos soportados..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
 
-#~ msgid "Test Settings"
-#~ msgstr "Probar Configuraci�n"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "Mail source type:"
-#~ msgstr "Tipo de fonte de correo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
 
-#~ msgid "News source type:"
-#~ msgstr "Tipo de fonte de Novas:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "Mail transport type:"
-#~ msgstr "Tipo de transporte de correo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_T�dalas Persoas e Recursos"
 
-#~ msgid "Add Identity"
-#~ msgstr "Engadir Identidade"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "T�dalas _Persoas e Un Recurso"
 
-#~ msgid "Edit Identity"
-#~ msgstr "Editar Identidade"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Persoas _Requiridas"
 
-#~ msgid "Add Source"
-#~ msgstr "Engadir Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Persoas Requiridas e _Un Recurso"
 
-#~ msgid "Edit Source"
-#~ msgstr "Editar Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora do _inicio da reuni�n:"
 
-#~ msgid "Add News Server"
-#~ msgstr "Engadir Servidor de News"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora do _final da reuni�n:"
 
-#~ msgid "Edit News Server"
-#~ msgstr "Editar Servidor de News"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Probando \"%s\""
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "a hora actual"
 
-#~ msgid "The connection was successful!"
-#~ msgstr "�A conexi�n foi correcta!"
+#. 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 "Address"
-#~ msgstr "Enderezo"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr "%B de %Y"
 
-#~ msgid "Identities"
-#~ msgstr "Identidades"
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Agora"
 
-#~ msgid "Mail Sources"
-#~ msgstr "Fontes de Correo"
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte do Correo"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: 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 "Mark message as seen [ms]: "
-#~ msgstr "Marcar mensaxe como lida [ms]: "
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#~ msgid "News Servers"
-#~ msgstr "Servidores de News"
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: 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 "News Sources"
-#~ msgstr "Fontes de Novas"
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
 
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Non hai soporte de GPG/PGP dispo�ible nesta copia do Evolution."
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#~ msgid "Delete a contact"
-#~ msgstr "Borrar un contacto"
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Buscar"
 
-#~ msgid "Find"
-#~ msgstr "Buscar"
+#: widgets/misc/e-filter-bar.c:231
+msgid "Advanced Search"
+msgstr ""
 
-#~ msgid "Find a contact"
-#~ msgstr "Buscar un contacto"
+#: widgets/misc/e-filter-bar.c:311
+msgid "Advanced ..."
+msgstr ""
 
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
+#: widgets/misc/e-messagebox.c:141
+#, fuzzy
+msgid "Information"
+msgstr "Sen Informaci�n"
 
-#~ msgid "Stop"
-#~ msgstr "Parar"
+#: widgets/misc/e-messagebox.c:148
+#, fuzzy
+msgid "Warning"
+msgstr "Movendo"
 
-#~ msgid "Stop Loading"
-#~ msgstr "Parar a Carga"
+#: widgets/misc/e-messagebox.c:162
+#, fuzzy
+msgid "Question"
+msgstr "Descrici�n:"
 
-#~ msgid "View All"
-#~ msgstr "Ver Todos"
+#: widgets/misc/e-messagebox.c:169
+#, fuzzy
+msgid "Message"
+msgstr "_Mensaxe"
 
-#~ msgid "View all contacts"
-#~ msgstr "Ver t�dolos contactos"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Borrar esta mensaxe"
 
+#: widgets/misc/e-search-bar.c:140
 #, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuraci�n do _Correo..."
+msgid "Sear_ch"
+msgstr "Buscar"
 
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Imprimir Contactos..."
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#, fuzzy
+msgid "The Personal Addressbook Server"
+msgstr "Engadir Fonte"
 
-#~ msgid "_Search for contacts"
-#~ msgstr "_Buscar contactos"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
-#~ msgid "5 Days"
-#~ msgstr "5 D�as"
+#: wombat/wombat.c:153
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Non foi posible inicializar Bonobo"
 
+#: wombat/wombat.c:165
 #, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Axenda"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Preferencias da Axenda..."
+#: wombat/wombat.c:178
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crear unha nova cita"
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#~ msgid "Create a new calendar"
-#~ msgstr "Crear unha nova axenda"
+#, fuzzy
+#~ msgid "Connect to server"
+#~ msgstr "Non foi posible conectarse � servidor POP en %s."
 
-#~ msgid "Day"
-#~ msgstr "D�a"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#~ msgid "Go back in time"
-#~ msgstr "Ir para atr�s no tempo"
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#~ msgid "Go forward in time"
-#~ msgstr "Ir para diante no tempo"
+#, fuzzy
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Go to"
-#~ msgstr "Ir para"
+#~ msgid "Disabled"
+#~ msgstr "Desactivado"
 
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para a data especificada"
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
 
-#~ msgid "Month"
-#~ msgstr "Mes"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar do Pilot"
 
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir unha axenda"
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar � Pilot"
 
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir esta axenda"
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mesturar do Pilot"
 
-#~ msgid "Show 1 day"
-#~ msgstr "Amosar un d�a"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mesturar � Pilot"
 
-#~ msgid "Show 1 month"
-#~ msgstr "Amosar un mes"
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Show 1 week"
-#~ msgstr "Amosar unha semana"
+#~ msgid "Original Author:"
+#~ msgstr "Autor Orixinal:"
 
-#~ msgid "Show the working week"
-#~ msgstr "Amosar a semana laboral"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "Week"
-#~ msgstr "Semana"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
 
-#~ msgid "_New"
-#~ msgstr "_Novo"
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
-#~ msgid "_Open Calendar"
-#~ msgstr "_Abrir axenda"
+#~ msgid "Synchronize Action"
+#~ msgstr "Sincronizar Acci�n"
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimir esta axenda"
+#~ msgid "Conduit state"
+#~ msgstr "Estado do conducto"
 
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gardar _Como..."
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Non hai ning�n pilot configurado, escolla\n"
+#~ "primeiro a capplet 'Propiedades da Ligaz�n co Pilot'."
 
-#~ msgid "Delete this item"
-#~ msgstr "Borrar este elemento"
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Non conectado � demo gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Ocorreu un erro � obter a lista de\n"
+#~ "pilots do demo gnome-pilot"
 
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Eliminar"
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srta.\n"
+#~ "D.\n"
+#~ "D�.\n"
+#~ "Dr.\n"
+#~ "Dra.\n"
+#~ "Prof.\n"
 
-#~ msgid "Help"
-#~ msgstr "Axuda"
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Conducto de Axenda de Evolution"
 
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "_Configuraci�n da Impresi�n..."
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr ""
+#~ "Utilidade de configuraci�n para o conducto de axenda de evolution.\n"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Utilidade de configuraci�n para o conducto a-facer de evolution.\n"
 
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este elemento"
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
+#~ msgid "Open..."
+#~ msgstr "Abrir..."
 
-#~ msgid "Save _As..."
-#~ msgstr "Gardar _Como..."
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
 
-#~ msgid "Save and Close"
-#~ msgstr "Gardar e Pechar"
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Introduza o asunto da mensaxe"
 
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Gardar o contacto e pechar a caixa de di�logo"
+#~ msgid "Saving changes to message..."
+#~ msgstr "Gardando as modificaci�ns da mensaxe..."
 
-#~ msgid "See online help"
-#~ msgstr "Ver a axuda online"
+#~ msgid "Save changes to message..."
+#~ msgstr "Gardar as modificaci�ns da mensaxe..."
 
-#~ msgid "_File"
-#~ msgstr "_Ficheiro"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Editar Regra de Filtrado"
 
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
-
-#~ msgid "_Save"
-#~ msgstr "_Gardar"
+#~ msgid "outgoing"
+#~ msgstr ""
+#~ "Entrante\n"
+#~ "Sa�nte\n"
 
-#~ msgid "About this application"
-#~ msgstr "Acerca desta aplicaci�n"
+#~ msgid "Add Rule"
+#~ msgstr "Engadir Regra"
 
-#~ msgid "About..."
-#~ msgstr "Acerca de..."
+#~ msgid "Body or subject contains"
+#~ msgstr "O corpo ou o asunto conte�en"
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
+#~ msgid "Body contains"
+#~ msgstr "O corpo cont�n"
 
-#~ msgid "C_ut"
-#~ msgstr "Co_rtar"
+#~ msgid "Subject contains"
+#~ msgstr "O asunto cont�n"
 
-#~ msgid "Clear"
-#~ msgstr "Limpar"
+#~ msgid "Body does not contain"
+#~ msgstr "O corpo non cont�n"
 
-#~ msgid "Clear the selection"
-#~ msgstr "Limpar a selecci�n"
+#~ msgid "Subject does not contain"
+#~ msgstr "O asunto non cont�n"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Pechar esta cita"
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro %s:\n"
+#~ "%s"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
+#, fuzzy
+#~ msgid "Registering local folder"
+#~ msgstr "Creando unha nova carpeta"
 
-#~ msgid "Copy the selection"
-#~ msgstr "Copiar a selecci�n"
+#, fuzzy
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible crear a carpeta `%s':\n"
+#~ "%s"
 
-#~ msgid "Cut"
-#~ msgstr "Cortar"
+#~ msgid "Fetching email from %s"
+#~ msgstr "Recibindo correo de %s"
 
-#~ msgid "Cut the selection"
-#~ msgstr "Cortar a selecci�n"
+#~ msgid "Fetch email from %s"
+#~ msgstr "Recibir correo de %s"
 
-#~ msgid "Dump XML"
-#~ msgstr "Envorcar XML"
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Envorcar a descrici�n Xml da Interface"
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Libro de enderezos..."
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Veri_ficar Nomes"
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Axuda"
+#~ msgid "(No description)"
+#~ msgstr "(Sen descrici�n)"
 
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Tarefa in_completa"
+#, fuzzy
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Cargando a Carpeta %s"
 
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Inserir Ficheiro"
+#, fuzzy
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Cargando a Carpeta %s"
 
-#~ msgid "Find Again"
-#~ msgstr "Buscar Novamente"
+#~ msgid "Could not create dialog box."
+#~ msgstr "Non foi posible crear a caixa de di�logo."
 
-#~ msgid "Find _Again"
-#~ msgstr "Buscar _Novamente"
+#~ msgid "User cancelled query."
+#~ msgstr "O usuario cancelou a consulta."
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "Modificar as propiedades do ficheiro"
+#~ msgid "Examining %s"
+#~ msgstr "Examinando %s"
 
-#~ msgid "N_ext"
-#~ msgstr "Se_guinte"
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "Recibindo a mensaxe %d de %d"
 
-#~ msgid "Paste the clipboard"
-#~ msgstr "Pegar o contido do cartafol"
+#~ msgid "Writing message %d of %d"
+#~ msgstr "Escribindo a mensaxe %d de %d"
 
-#~ msgid "Print S_etup..."
-#~ msgstr "_Configuraci�n da Impresi�n..."
+#~ msgid "Saving changes to %s"
+#~ msgstr "Gardando as modificaci�ns de %s"
 
-#~ msgid "Print Setup"
-#~ msgstr "Configuraci�n da Impresi�n"
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non se pode abrir a localizai�n `%s':\n"
+#~ "%s"
 
-#~ msgid "Properties"
-#~ msgstr "Propiedades"
+#, fuzzy
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#~ msgid "Redo"
-#~ msgstr "Refacer"
+#, fuzzy
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Nova Cita"
 
-#~ msgid "Redo the undone action"
-#~ msgstr "Refacer a acci�n desfeita"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Contacto"
 
-#~ msgid "Replace"
-#~ msgstr "Substitu�r"
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Tarefa"
 
-#~ msgid "Replace a string"
-#~ msgstr "Substitu�r unha cadea"
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: Solicitude de _Tarefa"
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Gardar a cita e pechar a caixa de di�logo"
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: Entrada de _Xornal"
 
-#~ msgid "Save the current file"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Nota"
 
-#, fuzzy
-#~ msgid "Schedule Meeting"
-#~ msgstr "FIXME: Programar Reuni�n"
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Es_colla un Formulario..."
 
 #, fuzzy
-#~ msgid "Schedule _Meeting"
-#~ msgstr "FIXME: _Programar Reuni�n"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Buscar novamente a mesma cadea"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "FIXME: Definir E_stilos de Impresi�n"
 
-#~ msgid "Search for a string"
-#~ msgstr "Buscar unha cadea"
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: _Enviar"
 
-#~ msgid "Select everything"
-#~ msgstr "Seleccionar todo"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Gardar Ane_xos..."
 
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Configurar as opci�ns de p�xina para a impresora actual"
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: _Mover para a Carpeta..."
 
-#~ msgid "Undo"
-#~ msgstr "Desfacer"
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: Cop_iar � Carpeta..."
 
-#~ msgid "Undo the last action"
-#~ msgstr "Desfacer a �ltima acci�n"
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Pre_visualizaci�n da Impresi�n"
 
-#~ msgid "_About..."
-#~ msgstr "_Acerca de..."
+#, fuzzy
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "FIXME: Pegar _Especial..."
 
-#~ msgid "_Close"
-#~ msgstr "_Pechar"
+#~ msgid "_Object"
+#~ msgstr "_Obxecto"
 
-#~ msgid "_Copy"
-#~ msgstr "_Copiar"
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Elemento"
 
-#~ msgid "_Debug"
-#~ msgstr "_Depuraci�n"
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: Elemento _non Lido"
 
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: _Est�ndar"
 
-#~ msgid "_Find..."
-#~ msgstr "_Buscar..."
+#, fuzzy
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "FIXME: Fo_rmato"
 
-#~ msgid "_Help"
-#~ msgstr "A_xuda"
+#~ msgid "_Toolbars"
+#~ msgstr "_Barras de ferramentas"
 
-#~ msgid "_Paste"
-#~ msgstr "_Pegar"
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Ficheiro..."
 
-#~ msgid "_Print"
-#~ msgstr "_Imprimir"
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: _Elemento..."
 
-#~ msgid "_Properties..."
-#~ msgstr "_Propiedades..."
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Obxecto..."
 
-#~ msgid "_Redo"
-#~ msgstr "_Refacer"
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Fonte..."
 
-#~ msgid "_Replace..."
-#~ msgstr "_Substitu�r..."
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _Par�grafo..."
 
-#~ msgid "_Undo"
-#~ msgstr "_Desfacer"
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Dese�ar este _Formulario"
 
-#~ msgid "Compose"
-#~ msgstr "Redactar"
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: _Dese�ar un Formulario..."
 
-#~ msgid "Compose a new message"
-#~ msgstr "Redactar unha nova mensaxe"
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Publicar _Formulario..."
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copiar a mensaxe nunha nova carpeta"
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#~ msgid "F_older"
-#~ msgstr "_Carpeta"
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: _Depurador de Script"
 
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Contrasinais"
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Ortograf�a..."
 
-#~ msgid "Get Mail"
-#~ msgstr "Recibir Correo"
+#~ msgid "_Forms"
+#~ msgstr "_Formularios"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Borrar Mensaxe"
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Mensaxe reenviada - %s"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensaxe seleccionada"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtros de Correo..."
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "FIXME: _Ortograf�a..."
 
 #, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Descrici�n:"
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "FIXME: _Contacto"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Marcar como _Lida"
+#, fuzzy
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "FIXME: Entrada de _Xornal"
 
-#~ msgid "Move"
-#~ msgstr "Mover"
+#, fuzzy
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "FIXME: Cop_iar � Carpeta..."
 
-#~ msgid "Move message to a new folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
+#, fuzzy
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
+#, fuzzy
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+#, fuzzy
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "FIXME: Reenviar como v_Calendar"
 
-#~ msgid "Print message to the printer"
-#~ msgstr "Imprimir mensaxe na impresora"
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: _Reenviar"
 
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
+#, fuzzy
+#~ msgid "FIXME: Previous"
+#~ msgstr "Anterior"
 
-#~ msgid "Reply to _All"
-#~ msgstr "Responder a _Todos"
+#, fuzzy
+#~ msgid "FIXME: Next"
+#~ msgstr "FIXME: _Nota"
 
-#~ msgid "Reply to _Sender"
-#~ msgstr "Responder � _Autor"
+#~ msgid "Group %i"
+#~ msgstr "Grupo %i"
 
-#~ msgid "Select _All"
-#~ msgstr "Seleccionar _Todo"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Enviar o correo na cola e recibir o correo novo"
+#~ msgid "C_lassification:"
+#~ msgstr "C_lasificaci�n:"
 
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Ver Todos"
+#~ msgid "task-editor-dialog"
+#~ msgstr "di�logo-editor-tarefas"
 
-#~ msgid "_Apply Filters"
-#~ msgstr "_Aplicar Filtros"
+#~ msgid "Days"
+#~ msgstr "D�as"
 
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Copiar � Carpeta"
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Editar Mensaxe"
+#~ msgid "Mail _to:"
+#~ msgstr "Enviar _a:"
 
-#~ msgid "_Forward"
-#~ msgstr "_Reenviar"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverter Selecci�n"
+#~ msgid "Time"
+#~ msgstr "Hora"
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuraci�n do _Correo..."
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
 
-#~ msgid "_Message"
-#~ msgstr "_Mensaxe"
+#~ msgid "_Mail"
+#~ msgstr "_Correo"
 
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Mover para a Carpeta"
+#~ msgid "_Program"
+#~ msgstr "_Programa"
 
-#~ msgid "_Open in New Window"
-#~ msgstr "_Abrir nunha Nova Fiestra"
+#~ msgid "event-editor-dialog"
+#~ msgstr "di�logo-editor-eventos"
 
-#~ msgid "_Print Message"
-#~ msgstr "_Imprimir Mensaxe"
+#~ msgid "label21"
+#~ msgstr "label21"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Gardar como..."
+#~ msgid "Show all hidden"
+#~ msgstr "Ver Todos"
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
+#~ msgid "Hide deleted"
+#~ msgstr "Eliminar"
 
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "_Borrar"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "O asunto � %s"
 
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Carpetas Virtuais"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Non ten ningunha fonte de correo configurada"
 
 #, fuzzy
-#~ msgid "Attach"
-#~ msgstr "Inclu�r un ficheiro"
+#~ msgid "Account Properties"
+#~ msgstr "Propiedades do anexo"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Noraboa, a configuraci�n do correo est� completa."
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Mensaxe cifrada"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Enderezo de Email:"
 
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Inclu�r un ficheiro como anexo na mensaxe"
+#~ msgid "Reply-to:"
+#~ msgstr "Responder-a:"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Server Timeouts"
+#~ msgstr "Tipo de Servidor: "
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Gardar _Como"
+#~ msgid "Servers"
+#~ msgstr "Servidor:"
 
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Ir � carpeta..."
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
 
-#, fuzzy
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "Signature File"
+#~ msgstr "Ficheiro de Sinatura"
 
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
 
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Autor"
+#~ msgid "Detect supported types..."
+#~ msgstr "Detectar tipos soportados..."
 
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Autor"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Non borrar as mensaxes do servidor"
 
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Autor"
+#~ msgid "Mail source type:"
+#~ msgstr "Tipo de fonte de correo:"
 
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "News source type:"
+#~ msgstr "Tipo de fonte de Novas:"
 
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
+#~ msgid "Mail transport type:"
+#~ msgstr "Tipo de transporte de correo:"
 
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "Add Identity"
+#~ msgstr "Engadir Identidade"
 
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Borrar esta mensaxe"
+#~ msgid "Edit Identity"
+#~ msgstr "Editar Identidade"
 
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Gardar Anexo"
+#~ msgid "Edit Source"
+#~ msgstr "Editar Fonte"
 
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "anexo"
+#~ msgid "Add News Server"
+#~ msgstr "Engadir Servidor de News"
 
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviando unha mensaxe sen asunto"
+#~ msgid "Edit News Server"
+#~ msgstr "Editar Servidor de News"
 
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Abrir..."
+#~ msgid "Testing \"%s\""
+#~ msgstr "Probando \"%s\""
 
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Engadir a carpeta � s�a lista de carpetas subscritas"
+#~ msgid "The connection was successful!"
+#~ msgstr "�A conexi�n foi correcta!"
 
-#~ msgid "Refresh List"
-#~ msgstr "Actualizar Lista"
+#~ msgid "Identities"
+#~ msgstr "Identidades"
 
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Actualizar Lista de Carpetas"
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte do Correo"
 
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Eliminar a carpeta da s�a lista de carpetas subscritas"
+#~ 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 "Subscribe"
-#~ msgstr "Subscribir"
+#, fuzzy
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configuraci�n do _Correo..."
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Desubscribir"
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimir Contactos..."
 
-#~ msgid "Display a different folder"
-#~ msgstr "Visualizar unha carpeta diferente"
+#, fuzzy
+#~ msgid "Ca_lendar"
+#~ msgstr "Axenda"
 
-#~ msgid "E_xit"
-#~ msgstr "_Sa�r"
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir unha axenda"
 
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "_Atallo da barra do Evolution"
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimir esta axenda"
 
-#~ msgid "Exit the program"
-#~ msgstr "Sa�r do programa"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Veri_ficar Nomes"
 
-#~ msgid "Getting _Started"
-#~ msgstr "_Iniciaci�n"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Axuda"
 
-#~ msgid "Show information about Evolution"
-#~ msgstr "Amosar informaci�n sobre o Evolution"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Tarefa in_completa"
 
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Amosar a Barra de _Carpetas"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Inserir Ficheiro"
 
-#, fuzzy
-#~ msgid "Submit _Bug Report"
-#~ msgstr "_Enviar un Informe de Erro"
+#~ msgid "Find _Again"
+#~ msgstr "Buscar _Novamente"
 
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Enviar un informe de erro usando o Bug Buddy"
+#~ msgid "_Find..."
+#~ msgstr "_Buscar..."
 
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Uso do Xestor de Co_ntactos"
+#~ msgid "_Redo"
+#~ msgstr "_Refacer"
 
-#~ msgid "Using the _Calendar"
-#~ msgstr "Uso da _Axenda"
+#~ msgid "_Replace..."
+#~ msgstr "_Substitu�r..."
 
-#~ msgid "Using the _Mailer"
-#~ msgstr "Uso do Cliente de _Correo"
+#~ msgid "_Undo"
+#~ msgstr "_Desfacer"
 
-#~ msgid "_About Evolution..."
-#~ msgstr "_Acerca do Evolution..."
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
 
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Cita (FIXME)"
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaxe..."
 
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto (FIXME)"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Responder � _Autor"
+
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Ver Todos"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Editar Mensaxe"
 
-#~ msgid "_Folder"
-#~ msgstr "_Carpeta"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configuraci�n do _Correo..."
 
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Ir para a Carpeta..."
+#~ msgid "_Open in New Window"
+#~ msgstr "_Abrir nunha Nova Fiestra"
 
-#~ msgid "_Index"
-#~ msgstr "�_ndice"
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimir Mensaxe"
 
-#~ msgid "_Settings"
-#~ msgstr "_Configuraci�n"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Gardar como..."
 
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Tarefa (FIXME)"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Fontes"
 
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Elemento(s) pertencentes a estas categor�as:"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Amosar a Barra de _Carpetas"
 
 #~ msgid "Available Categories:"
 #~ msgstr "Categor�as Dispo�ibles:"
@@ -6591,15 +9192,6 @@ msgstr "Grupo %i"
 #~ msgid "Port Number:"
 #~ msgstr "N�mero de Porto:"
 
-#~ msgid "Empty days:"
-#~ msgstr "D�as baleiros:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Citas:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "D�a salientado:"
-
 #~ msgid "Day numbers:"
 #~ msgstr "N�meros dos d�as:"
 
@@ -6669,9 +9261,6 @@ msgstr "Grupo %i"
 #~ msgid "third"
 #~ msgstr "terceiro"
 
-#~ msgid "fourth"
-#~ msgstr "cuarto"
-
 #~ msgid "fifth"
 #~ msgstr "quinto"
 
@@ -6710,13 +9299,6 @@ msgstr "Grupo %i"
 #~ msgid "Mail Source"
 #~ msgstr "Fonte de Correo"
 
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "A configuraci�n do correo electr�nico est� completa.\n"
-#~ "Prema \"Finalizar\" para gardar a nova configuraci�n"
-
 #~ msgid "Send a message without a subject"
 #~ msgstr "Enviar unha mensaxe sen asunto"
 
@@ -6729,9 +9311,6 @@ msgstr "Grupo %i"
 #~ msgid "Marking message %d of %d"
 #~ msgstr "Marcando a mensaxe %d de %d"
 
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Reenviando mensaxes \"%s\""
-
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "Reenviando unha mensaxe sen asunto"
 
@@ -6757,19 +9336,12 @@ msgstr "Grupo %i"
 #~ msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
 #~ msgid "N_ew Directory Server"
 #~ msgstr "Novo Servidor de _Directorio"
 
-#~ msgid "_Actions"
-#~ msgstr "_Acci�ns"
-
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Gardar Axenda Como"
 
@@ -6798,12 +9370,6 @@ msgstr "Grupo %i"
 #~ msgid "Alarm Properties"
 #~ msgstr "Propiedades da Alarma"
 
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "As alarmas sonoras expiran tras"
-
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
 
@@ -6831,9 +9397,6 @@ msgstr "Grupo %i"
 #~ msgid "Browse..."
 #~ msgstr "Explorar..."
 
-#~ msgid "Optional Information"
-#~ msgstr "Informaci�n Opcional"
-
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Non foi posible crear unha canalizaci�n con %s: %s"
 
diff --git a/po/hu.po b/po/hu.po
index b12933f2f6..0982a7160c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,193 +1,22 @@
-#: camel/providers/smtp/camel-smtp-transport.c:285
+#
+# Szabolcs BAN <shooby@gnome.hu>, 2001
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:18+0100\n"
 "PO-Revision-Date: 2001-01-24 15:15+0100\n"
 "Last-Translator: Szabolcs BAN <shooby@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: 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 "A Bonobo inicializ�l�sa nem siker�lt"

-

-#: 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 kiszolg�l�t"
-
-#: 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

-msgid "Notes Component: Could not initialize bonobo"

-msgstr "Notes komponens: A Bonobo inicializ�l�sa nem siker�lt"

-

-#: addressbook/backend/ebook/e-card.c:3049

-msgid "Card: "

-msgstr "K�rtya:"

+#: addressbook/backend/ebook/e-card.c:3053
+msgid "Card: "
+msgstr "K�rtya:"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -195,7 +24,7 @@ msgstr ""
 "\n"
 "N�v:  "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
@@ -203,7 +32,7 @@ msgstr ""
 "\n"
 " El�tag:      "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
@@ -211,7 +40,7 @@ msgstr ""
 "\n"
 "  Adott:      "
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
@@ -219,7 +48,7 @@ msgstr ""
 "\n"
 "  Egy�b:      "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
@@ -227,7 +56,7 @@ msgstr ""
 "\n"
 "  Csal�di:    "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
@@ -235,7 +64,7 @@ msgstr ""
 "\n"
 "  Ut�tag:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -243,7 +72,7 @@ msgstr ""
 "\n"
 "Sz�let�si d�tum: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -251,7 +80,7 @@ msgstr ""
 "\n"
 "C�m:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -259,7 +88,7 @@ msgstr ""
 "\n"
 "  Postafi�k:   "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
@@ -267,7 +96,7 @@ msgstr ""
 "\n"
 " K�l:"
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -275,7 +104,7 @@ msgstr ""
 "\n"
 "  �t:          "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -283,7 +112,7 @@ msgstr ""
 "\n"
 "  V�ros:       "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
@@ -291,7 +120,7 @@ msgstr ""
 "\n"
 "  R�gi�:       "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -299,7 +128,7 @@ msgstr ""
 "\n"
 " Ir�ny�t�sz�m: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -307,13 +136,13 @@ msgstr ""
 "\n"
 "  Orsz�g:      "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
@@ -321,7 +150,7 @@ msgstr ""
 "\n"
 "Telefonok:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
@@ -329,7 +158,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -337,7 +166,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -345,7 +174,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
@@ -353,7 +182,7 @@ msgstr ""
 "\n"
 "Levelez�: "
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -361,7 +190,7 @@ msgstr ""
 "\n"
 "Id�z�na: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
@@ -369,7 +198,7 @@ msgstr ""
 "\n"
 "Hely: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
@@ -377,7 +206,7 @@ msgstr ""
 "\n"
 "�zleti szab�ly:"
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
@@ -385,7 +214,7 @@ msgstr ""
 "\n"
 "C�g:"
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -393,7 +222,7 @@ msgstr ""
 "\n"
 " N�v:"
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
@@ -401,7 +230,7 @@ msgstr ""
 "\n"
 " Egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
@@ -409,7 +238,7 @@ msgstr ""
 "\n"
 " 2. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
@@ -417,7 +246,7 @@ msgstr ""
 "\n"
 " 3. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
@@ -425,7 +254,7 @@ msgstr ""
 "\n"
 " 4. egys�g:"
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -433,7 +262,7 @@ msgstr ""
 "\n"
 "Kateg�ri�k:"
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -451,7 +280,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
@@ -459,7 +288,7 @@ msgstr ""
 "\n"
 "Egyedi sz�veg:"
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -467,124 +296,25 @@ msgstr ""
 "\n"
 "Nyilv�nos kulcs:"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Tiltva"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Szinkroniz�l�s"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr " M�sol�s a pilotr�l"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "M�sol�s a pilotra"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "�sszevet�s a pilotr�l"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "�sszevet�s a pilotra"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Eredeti tulajdonos:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evol�ci� c�mlista csatorna"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 a Free Software Foundation �s a Helix Code"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigur�ci�s eszk�z az Evol�ci� c�mjegyz�k csatorn�j�hoz.\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Szinkroniz�ci�s elj�r�s"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Csatorna �llapot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nincs pilot be�ll�tva, k�rlek v�laszd ki a\n"
-"'Pilot Link Properties' cappletet el�sz�r."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nincs a gnome-pilot daemonra kapcsol�dva"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Hiba l�pett fel a pilotok list�j�nak\n"
-"a gnome-pilot daemont�l val� lek�r�sekor "
+#: addressbook/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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -594,344 +324,436 @@ msgstr "A kurzort nem tudom bet�lteni\n"
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nem tudom elind�tani a wombat kiszolg�l�t"
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nem tudom a wombat-ot elind�tani"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr "Nem tudom a pilot Address application blokkj�t olvasni"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "Hozz�_ad"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
+msgstr "Hozz�ad"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_T�r�l"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "�_vfordul�:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Telefon t�pusok"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "�z_leti"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "�j telefon t�pus"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "�zleti _fax"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Hozz�ad"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "_N�vjegyek..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ka_teg�ri�k..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "N�vjegy szerkeszt�"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Teljes n�v..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "R�szletek"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "F�jl mint:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Weblap c�m:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "_HTML levelet k�r"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "�_zleti"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "Alap"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Otthoni"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "�j telefon t�pus"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "�zleti _fax"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "Felje_gyz�sek:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Mobil"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Telefon t�pusok"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Els�dleges email"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "�z_leti"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "_HTML levelet k�r"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "Ez a _levelez�si c�m"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Weblap c�m:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "_N�vjegyek..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "Hozz�_ad"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ka_teg�ri�k..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_C�m..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Beoszt�s"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "_Asszisztens neve:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "Sz�let�sna_p:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "�_zleti"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_V�llalat:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_C�m..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Alap"
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_T�r�l"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Oszt�ly:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "_Teljes n�v..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Otthoni"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_Beoszt�s"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "_F�n�k neve:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "Be_cen�v:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "_Hivatal:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Foglalkoz�s:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "Be_cen�v:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "H�za_st�rs:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Sz�let�sna_p:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "_Asszisztens neve:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "_F�n�k neve:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "�_vfordul�:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "Ez a _levelez�si c�m"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "Felje_gyz�sek:"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "R�szletek"
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "Az elemek az al�bbi kateg�ri�khoz tartoznak:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 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
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "�zleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "2. �zleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "�zleti fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Visszah�v�s"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Aut�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 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
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "2. Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "M�s"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Egy�b fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Szem�lyh�v�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Els�dleges"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "R�di�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "2. email"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "3. email"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Sz�r�k szerkeszt�se"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Teljes n�v:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "2. email"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "2.c�m:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Kanada"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr "A c�m ellen�rz�se"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "Ors_z�g:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finnorsz�g"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "USA"
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_C�m:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_V�ros:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr "_Postafi�k:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "�_llam/Helytart�s�g:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Ir�ny�t�sz�m:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "A teljes n�v ellen�rz�se"
 
-#: addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
 #, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+msgid "I"
+msgstr "Ha"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
-"\n"
-"Dr.\n"
-"Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "egy"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
 msgstr ""
-"\n"
-"Ifj.\n"
-"�zv.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Keresztn�v:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Beoszt�s:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Vezet�kn�v:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Ut�n�v:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Vezet�kn�v:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_El�tag:"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Beoszt�s:"
+
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "_K�rty�kk�nt"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "_T�bl�zatk�nt"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Nem tudom megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -952,27 +774,27 @@ msgstr ""
 "haszn�lni egy LDAP kiszolg�l�t, le kell t�ltened �s\n"
 "telep�tened az OpenLDAP csomagot, �s �jraford�tani az Evol�ci�t.\n"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Halad�..."
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr "A n�v tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "Email tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappa B�ng�sz� meg fog nyitni"
 
@@ -981,200 +803,466 @@ msgstr "Az URI amit a Mappa B�ng�sz� meg fog nyitni"
 msgid "Other Contacts"
 msgstr "N�vjegy t�rl�se?"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 #, fuzzy
 msgid "LDAP Server"
 msgstr "LDAP kiszolg�l�:"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "_Mobil"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Nem tudom megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Jelsz�"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 #, fuzzy
 msgid "Base"
 msgstr "Lap"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 #, fuzzy
 msgid "Subtree"
 msgstr "Forr�s"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "�r�k"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Priorit�s:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "Root DN:"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Keres�s"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Authentik�ci�:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "�tvonal:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "A f�jl nem l�tezik."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "C�mjegyz�kbe ment�s"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "C�mjegyz�kbe ment�s"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "N�v:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Le�r�s:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Forr�s hozz�ad�sa"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "T�r�l"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Szerkeszt"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#, fuzzy
+msgid "Name"
+msgstr "N�v:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "N�vjegy t�rl�se?"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Konfigur�ci�s eszk�z az Evol�ci� c�mjegyz�k csatorn�j�hoz.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evol�ci� c�mlista csatorna"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "C�mjegyz�kben val� keres�shez kattints ide"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evol�ci� c�mlista csatorna"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "T�rl�s"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "T�rl�s"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Keres�s..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr "Lev�l c�mzettek"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select Names"
+msgstr "V�lassz neveket"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "V�lassz egy nevet a list�b�l:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Keres�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: 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:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "VCard-k�nt ment�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 #, fuzzy
-msgid "Name"
-msgstr "N�v:"
+msgid "* Click here to add a contact *"
+msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "2. email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Szervezet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 #, fuzzy
 msgid "Department"
 msgstr "_Oszt�ly:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 #, fuzzy
 msgid "Office"
 msgstr "_Hivatal:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "_Beoszt�s:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 #, fuzzy
 msgid "Profession"
 msgstr "_Foglalkoz�s:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 #, fuzzy
 msgid "Manager"
 msgstr "Szem�lyh�v�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Nickname"
 msgstr "Be_cen�v:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Spouse"
 msgstr "H�za_st�rs:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "Semmi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
+
 #: 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:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1188,129 +1276,312 @@ msgstr ""
 "\n"
 "�j n�vjegy k�sz�t�s�hez kattints kett�t ide."
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evol�ci� napt�r csatorna"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "K�rtya:"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+#: 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 "A v�g�n a formok �r�t�se:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "T�rzs"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Als�:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Dimenzi�k:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Bet�t�pus..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Bet�t�pusok"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "L�bl�c:"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Form�tum"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Fejl�c"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Fejl�c/l�bl�c"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Fejl�cek"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "Fejl�c minden lev�lnek"
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Magass�g:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr "R�gt�n egym�s ut�n k�vetkeznek"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr "Bele�rtve:"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Fekv�"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Bal:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Lev�l c�mk�k minden lapon"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Marg�k"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "Oszlopok sz�ma:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Be�ll�t�sok"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Elhelyezked�s"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Lap"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr "Oldal be�ll�t�s:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Pap�r"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Pap�r forr�s:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "�ll�"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "El�n�zet:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Nyomat�s sz�rkesk�l�s �rnyal�ssal"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "P�ros lapokon ford�tott"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Jobb:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Szekci�k:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "�rnyal�s"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
+msgstr "M�ret:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "�j lapon kezdd"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "St�lus neve:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Fels�:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "T�pus"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Sz�less�g:"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem tudom a pilot Calendar application blokkj�t olvasni"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evol�ci� tennival� csatorna"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-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:599
-#: calendar/conduits/todo/todo-conduit.c:602
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem tudom a pilot Calendar ToDo blokkj�t olvasni"
 
-#: calendar/gui/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
-msgid "Snooze"
-msgstr "Szundi"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Nem tal�lom a f�jlt"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Napt�r megnyit�sa"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Napt�r ment�se"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 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: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"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: 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: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:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Nyilv�nos"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Szem�lyes"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Magas"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Norm�lis"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Alacsony"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "�ttetsz�"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Nem indult m�g el"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "Folyamatban"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+#, fuzzy
+msgid "Completed"
+msgstr "% k�sz:"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "M�gsem"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1321,36 +1592,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: 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"
-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: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: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: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:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1360,57 +1619,125 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1013
 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: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-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+#, fuzzy
+msgid "Recurring"
+msgstr "Ism�tl�d�s"
+
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Pontsz�m hozz�rendel�se"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "Most"
+
+#: calendar/gui/calendar-summary.c:196
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 #, fuzzy
 msgid "%I:%M%p"
 msgstr "%I:%M %p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 #, fuzzy
 msgid "Display"
 msgstr "_Megjelen�t"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "Mutasd az esem�nyek v�gpontj�t"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "csatol�s"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a napt�r megjelen�t"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "A tal�lkoz�d figyelmeztet� �zenete:"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Szundi"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Nem tudom a bonobo-t elind�tani"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+"Nem tudom l�trehozni a k�nyvt�rat\n"
+"%s\n"
+"Hiba: %s"
+
 #: 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"
@@ -1423,243 +1750,852 @@ msgstr "Tal�lkoz� figyelmeztet�s: %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Nincs el�rhet� �sszegz�s."
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "Bez�r"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "_Id�pont szerkeszt�se"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Szundi id� (percek)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 perc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 perc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 �r�s (de/du)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 perc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 �r�s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 perc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 perc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "Alarms timeout after"
+msgstr "Hang �bresz�s id�z�t�se"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr "Hang figyelmeztet�s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr "S�polj a figyelmeztet� ablak megjelen�sekor."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Napt�r"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Napt�r be�ll�t�sok"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Sz�nek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr "A h�tv�g�k �sszenyom�sa"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr "D�tum navig�tor be�ll�t�sok"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr "Alap�rtelmezett"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr "Megjelen�t�si be�ll�t�sok"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr "Lej�rat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#, fuzzy
+msgid "Enable snoozing for"
+msgstr "Szundi enged�se"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr "Nap v�ge:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr "A h�t els� napja:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "P�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "P�ntek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr "Kiemel�s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr "A ma lej�r� elemek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr "A ma lej�r� elemek:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr "M�g nem lej�rt elemek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr "M�g nem lej�rt elemek:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "H�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "H�tf�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr "Lej�rt elemek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr "Lej�rt elemek:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr "V�lassz egy sz�nt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Priorit�s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Remind me of all appointments"
+msgstr "Minden tal�lkoz�ra figyelmeztess"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+msgid "Reminders"
+msgstr "Eml�keztet�k"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "Szo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "Szombat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr "Mutasd"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Mutasd az esem�nyek v�gpontj�t"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "H�t sz�m�nak mutat�sa"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr "Nap kezdete:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Va"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Vas�rnap"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "TaskPad"
+msgstr "FeladatT�bla"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "Cs�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Cs�t�rt�k"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr "Lej�ratig h�tral�v� id�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr "Id�oszt�sok:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr "Id� form�tum:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Ke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Kedd"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr "Vizu�lis figyelmeztet�s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "Sze"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "Szerda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr "Munkah�t"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr "perc bek�vetkez�s�kig."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "m�sodperc."
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, 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:66
+#: calendar/gui/dialogs/delete-comp.c:71
 #, 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:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, 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:75
+#: calendar/gui/dialogs/delete-comp.c:80
 #, 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:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, 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:84
+#: calendar/gui/dialogs/delete-comp.c:89
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "T�nyleg t�r�lni akarod\n"
 "ezt a n�vjegyet?"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% k�sz:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Besorol�s"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "K�ld�s d�tuma"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr "Teljes�t�s d�tuma:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Szem�_lyes"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "Folyamatban"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "Nyil_v�nos"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Ke_zd�si d�tum:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "�sszegz�s:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Feladat"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "_Bizalmas"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_N�vjegyek..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
+msgstr "Le_j�rat:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Priorit�s:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_St�tusz:"
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Feladat v�ge"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: 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:154
+#: calendar/gui/e-calendar-table.c:156
 #, 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
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Elv�gezve"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "End Date"
 msgstr "_V�g id�pont:"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 #, 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
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent 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
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "Summary"
 msgstr "�_sszegz�s"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Transparency"
 msgstr "�ttetsz�"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Megnyit..."
+#: calendar/gui/e-calendar-table.c:169
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "A feladat megnyit�sa"
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "K�sznek jel�l"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Megjel�l�s mint k�sz feladat"
 
-#: 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:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "A megbesz�l�s szerkeszt�se..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Feladat v�ge"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "A feladat t�rl�se"
+
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "A feladat t�rl�se"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, 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:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "du"
 
-#: 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..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "�j _id�pont"
 
-#: 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:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Megnyit�s"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "A megbesz�l�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "V�lassz mapp�t"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "A megbesz�l�s mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "A megjelen�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Az �sszes megjelen�s t�rl�se"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:153
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+msgid "I couldn't read your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Napt�r"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "szept"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "T�r�l"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "K�s�rleti"
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "Napt�r megnyit�sa"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "M�gsem"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A %d %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Napt�r"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Lej�rat"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Napt�r nyomtat�sa"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Szervezet:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+msgid "Sender"
+msgstr "Felad�"
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "�sszegz�s:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+#, fuzzy
+msgid "date-start"
+msgstr "Nap kezdete:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+#, fuzzy
+msgid "Attendee"
+msgstr "Minden megh�vott"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Minden megh�vott"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+#, fuzzy
+msgid "Attendees: "
+msgstr "Minden megh�vott"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "M�gsem"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Aut�"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "Megbesz�l�s _kezd�dik:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Szervezet:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+#, fuzzy
+msgid "Required Participant"
+msgstr "_A k�rt emberek"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "Mobil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+#, fuzzy
+msgid "Status"
+msgstr "_St�tusz:"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Kateg�ri�k:"
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1671,304 +2607,580 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Megbesz�l�s szerkeszt�se"
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Az �sszes megjelen�s t�rl�se"
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr "ekkor:"
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr "Minden napos esem�ny"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
+msgstr "Megbesz�l�sek:"
+
+#: calendar/gui/event-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Megbesz�l�sek:"
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
+msgstr "Megadott ism�tl�d�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr "Minden"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Kiv�telek"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
+msgstr "M�dos�t�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr "Nincs ism�tl�d�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+#, fuzzy
+msgid "Preview"
+msgstr "El�n�zet:"
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr "Ism�tl�d�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
+msgstr "Ism�tl�d�si szab�ly"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+msgid "Reminder"
+msgstr "Eml�keztet�"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+#, fuzzy
+msgid "Run a program"
+msgstr "_Program ind�t�sa:"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "Levelek let�lt�se"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "Be�ll�t�sok tesztel�se"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "�rnyal�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr "Egyszer� ism�tl�d�s"
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "_V�g id�pont:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr "_Kezd�si id�:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr "Ke_zd�si d�tum:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "ut�na"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "el�tte"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
 msgstr "nap"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "H�tf�"
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "Minden tal�lkoz�ra figyelmeztess"
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Kedd"
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr "ez�rt:"
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Szerda"
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr "�r�kk�"
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Cs�t�rt�k"
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "�r�k"
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "P�ntek"
+#: calendar/gui/event-editor-dialog.glade.h:40
+#, fuzzy
+msgid "minute(s)"
+msgstr "percek"
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Szombat"
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "h�napban"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Vas�rnap"
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Id�pont szerkeszt�se"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "until"
+msgstr "am�g"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr "h�ten"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "�vben"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor.c:371
+msgid "Edit Appointment"
+msgstr "Megbesz�l�s szerkeszt�se"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr "ekkor:"
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "nap"
+
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 #, fuzzy
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "napok"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "nap"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "hetek"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "H�t sz�m�nak mutat�sa"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "�r�k"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "�ra"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "percek"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "10 perc"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr " m�sodperc ut�n"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr " m�sodperc ut�n"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "A megbesz�l�s t�rl�se"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "A megbesz�l�s t�rl�se"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Minden tal�lkoz�ra figyelmeztess"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "A megbesz�l�s t�rl�se"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, 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:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evol�ci� napt�r csatorna"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, 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:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: calendar/gui/gnome-cal.c:695
 #, fuzzy, c-format
 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:707
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. 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:1
+#, fuzzy
+msgid "April"
+msgstr "�prilis"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "H�"
+#: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
+msgid "August"
+msgstr "augusztus"
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ke"
+#: calendar/gui/goto-dialog.glade.h:3
+#, fuzzy
+msgid "December"
+msgstr "december"
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Sze"
+#: calendar/gui/goto-dialog.glade.h:4
+#, fuzzy
+msgid "February"
+msgstr "febru�r"
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Cs�"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "D�tumra ugr�s"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "P�"
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ugorj m�ra"
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Szo"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "January"
+msgstr "janu�r"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Nem tudom a bonobo-t elind�tani"
+msgid "July"
+msgstr "j�lius"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "June"
+msgstr "j�nius"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "March"
+msgstr "m�rcius"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "May"
+msgstr "H�tf�"
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "November"
+msgstr "november"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "October"
+msgstr "okt�ber"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "September"
+msgstr "szeptember"
+
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "V"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Szo"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Feladatok"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Mai nap (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, fuzzy, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aktu�lis h�t (%s %s %d - %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "Aktu�lis h�nap (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Ez�v (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Nyomtat�si el�n�zet"
 
@@ -1977,14 +3189,84 @@ msgstr "Nyomtat�si el�n�zet"
 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
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "VHKSCPS"
 
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "F�jl ment�si hiba: %s"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "F�jl ment�si hiba: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "F�jl ment�si hiba: %s"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr "Nem tudom a dial�gust elk�sz�teni."
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr "F�jl ment�si hiba: %s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
@@ -2039,7 +3321,7 @@ msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
 #: camel/camel-movemail.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
@@ -2057,79 +3339,199 @@ msgstr ""
 msgid "(Unknown error)"
 msgstr "(Ismeretlen hiba)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s kiszolg�l� %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 #, 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
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(ismeretlen kiszolg�l�)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Napt�r megnyit�sa"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "A kiszolg�l� a felhaszn�l�i nevet visszadobta"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authentik�ci�:"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr "F�jl bet�lt�si hiba: %s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "F�jl bet�lt�si hiba: %s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-search-private.c:105
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "Virtu�lis mappa email szolg�ltat�"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:417
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2139,31 +3541,32 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Feladat"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
+msgid "No such message: %s"
+msgstr "A lev�l tov�bb�t�sa"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -2175,7 +3578,7 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -2194,13 +3597,18 @@ msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Szinkroniz�l�s"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2212,25 +3620,41 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:263
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Authentik�ci�:"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2238,7 +3662,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2271,50 +3695,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Nem sima f�jl."
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
@@ -2351,42 +3767,42 @@ msgstr "A lev�l tov�bb�t�sa"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, fuzzy, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A f�jl nem l�tezik."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "'%s' nem k�nyvt�r."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "%s helyi lev�lk�nyvt�r"
@@ -2418,7 +3834,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2427,96 +3843,109 @@ msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a regular file."
 msgstr "Nem sima f�jl."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Szinkroniz�l�s"
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Szinkroniz�l�s"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Nem tudom m�solni a f�jlokat\n"
 "'%s'-be."
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 "Nem tudom elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
@@ -2527,7 +3956,7 @@ msgstr "Ismeretlen hiba: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "'%s' nem k�nyvt�r."
@@ -2599,16 +4028,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Lev�l �r�sa"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonos�t�j� lev�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Lev�l lista rendez�se t�ma szerint"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -2623,70 +4062,82 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 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:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -2697,7 +4148,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
@@ -2726,145 +4177,265 @@ msgstr ""
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Lev�l �r�sa"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Lev�l _nyomtat�sa"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Rejt�s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Authentik�ci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Authentik�ci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy
 msgid "No authentication required"
 msgstr "Authentik�ci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "%s kiszolg�l� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
-#, fuzzy, c-format
+#: camel/providers/smtp/camel-smtp-transport.c:846
+#, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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:604
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Ismeretlen hiba: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:896
+#, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Virtu�lis mappa email szolg�ltat�"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 b�jt"
@@ -2890,19 +4461,15 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "csatol�s"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: 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"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "T�rli a kiv�lasztott elemeket a csatol�si list�r�l"
@@ -2915,41 +4482,80 @@ msgstr "Csatol..."
 msgid "Attach a file to the message"
 msgstr "Csatolj egy f�jlt a lev�lhez"
 
-#: 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-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "csatol�s"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Csatol�s be�ll�t�sok"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "F�jln�v:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "csatol�s"
+
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "MIME t�pus:"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "'%s' k�ld�se"
+
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
-#: 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"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "Felad�:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Reply-To:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "T�ma:"
+
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 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:328
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2957,55 +4563,33 @@ 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:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "T�ma:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "�rd be a lev�l c�m�t (subject)"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Lev�l ment�se"
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Lev�l ment�se"
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evol�ci�"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3015,27 +4599,27 @@ msgstr ""
 "\n"
 "Menteni akarod a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "A f�jl nem l�tezik."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Nem sima f�jl."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Az a f�jl l�tezik, de nem olvashat�."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 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:961
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3043,24 +4627,263 @@ msgstr ""
 "A f�jl t�l nagy (100K f�l�tti).\n"
 "T�nyleg be szeretn�d sz�rni?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Hiba t�rt�nt megnyit�s k�zben."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evol�ci� napt�r csatorna"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "C�m"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Nincs inform�ci�"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%m/%d/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %m/%d/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: 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."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Levelek let�lt�se"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Bez�r"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mapp�ba mozgat"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Az el�z� elemre ugr�s"
+
+#: executive-summary/component/e-summary-url.c:79
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "K�vetkez� elemre ugr�s"
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Mappa be�ll�t�sa"
+
+#: executive-summary/component/e-summary.c:918
+#, 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:932
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "F�jl bet�lt�si hiba: %s"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "�_sszegz�s"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+#, fuzzy
+msgid "Error"
+msgstr "Nincs hiba"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update every "
+msgstr "_Szabad/foglalt friss�t�se"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "percek"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "�v"
@@ -3101,10 +4924,6 @@ msgstr "�r�k"
 msgid "minute"
 msgstr "perc"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "percek"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "m�sodperc"
@@ -3168,38 +4987,20 @@ msgstr "most"
 msgid "<click here to select a date>"
 msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Sz�r� szab�ly hozz�ad�sa"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Sz�r� szab�ly szerkeszt�se"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Sz�r�k szerkeszt�se"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Sz�r� szab�lyok"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Akkor"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "M�velet hozz�ad�sa"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr ""
 
@@ -3209,7 +5010,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
@@ -3221,421 +5022,531 @@ msgstr "�rj be egy mappa URI-t"
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiv�laszt�s�hoz>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr "Teszt"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Szab�ly neve:"
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "N�vtelen"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Ha"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr ""
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 #, fuzzy
 msgid "Replied to"
 msgstr "Mindenkinek"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "R�di�"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Sz�r�k szerkeszt�se"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VMapp�k szerkeszt�se"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid "Outgoing"
+msgstr "K�rvonal:"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+msgid "Virtual Folders"
+msgstr "Virtu�lis Mapp�k"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "A megadott mapp�t nem tal�lom"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "VMappa forr�sok"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "�j mappa k�sz�t�se"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Sz�n hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Pontsz�m hozz�rendel�se"
 
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Mapp�ba m�sol�s"
-
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Fogad�s d�tuma"
+#, fuzzy
+msgid "Attachments"
+msgstr "csatol�s"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "K�ld�s d�tuma"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "tartalmaz"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Kifejez�s"
+msgid "Copy to Folder"
+msgstr "Mapp�ba m�sol�s"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "A lev�l tov�bb�t�sa c�mre"
+msgid "Date received"
+msgstr "Fogad�s d�tuma"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Lev�lt�rzs"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Lev�lt�rzs"
+msgid "Date sent"
+msgstr "K�ld�s d�tuma"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not contain"
+msgstr "nem tartalmaz"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "A lev�l el lett k�ldve"
+msgid "does not end with"
+msgstr "nincs a v�g�n"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mapp�ba mozgat"
+msgid "does not exist"
+msgstr "nem l�tezik"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "C�mzettek"
+msgid "does not sound like"
+msgstr "nem �gy hangzik mint"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+msgid "does not start with"
+msgstr "nincs az elej�n"
 
-#: 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:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "nem l�tezik"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Felad�"
+msgid "ends with"
+msgstr "a v�g�n van"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "_St�tusz:"
+msgid "Exist"
+msgstr "Szerkeszt"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Forr�s"
+msgid "exists"
+msgstr "l�tezik"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "Expression"
+msgstr "Kifejez�s"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_St�tusz:"
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "A lev�l tov�bb�t�sa c�mre"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is"
+msgstr "egy"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "T�ma"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "nagyobb mint"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "ut�na"
+msgid "is less than"
+msgstr "kisebb mint"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "el�tte"
+msgid "is not"
+msgstr "nem egy"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "tartalmaz"
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s levelez�lista"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nem tartalmaz"
+msgid "Message Body"
+msgstr "Lev�lt�rzs"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nincs a v�g�n"
+#, fuzzy
+msgid "Message Header"
+msgstr "Lev�lt�rzs"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nem l�tezik"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "nem �gy hangzik mint"
+msgid "Message was sent"
+msgstr "A lev�l el lett k�ldve"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nincs az elej�n"
+msgid "Move to Folder"
+msgstr "Mapp�ba mozgat"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "a v�g�n van"
+msgid "on or after"
+msgstr "akkor vagy ut�n volt"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "l�tezik"
+msgid "on or before"
+msgstr "akkor vagy el�bb"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "nagyobb mint"
+msgid "Recipients"
+msgstr "C�mzettek"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "kisebb mint"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nem egy"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "egy"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Pontsz�m"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "akkor vagy ut�n volt"
+#, fuzzy
+msgid "Set Status"
+msgstr "_St�tusz:"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "akkor vagy el�bb"
-
-#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "�gy hangzik, mint"
 
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
+msgstr "Forr�s"
+
 #: filter/libfilter-i18n.h:42
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
 msgid "starts with"
 msgstr "�gy kezd�dik:"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "T�ma"
+
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "ut�n volt"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "el�tte volt"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Szab�ly hozz�ad�sa"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Pontsz�m szab�ly szerkeszt�se"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VMappa szab�ly hozz�ad�sa"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "VMappa szab�ly szerkeszt�se"
-
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "�breszt� be�ll�t�sok"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+#, fuzzy
+msgid "Properties"
+msgstr "�breszt� be�ll�t�sok"
+
+#: mail/folder-browser.c:219
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "V�lassz mapp�t"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "A sz�vegt�rzs vagy a t�ma tartalmaz"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "A sz�vegt�rzs tartalmaz"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "T�ma tartalmaz"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "A sz�vegt�rzs nem tartalmaz"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "A t�ma nem tartalmaz"
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VMappa a t�m�ra"
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VMappa a felad�ra"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VMappa a c�mzettekre"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Sz�r� a levelez�si list�ra"
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Sz�r� a t�m�ra"
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Sz�r� a felad�n"
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Sz�r� a c�mzettekre"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Sz�r� a levelez�si list�ra"
 
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "Megnyit�s"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Szerkeszt"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 #, fuzzy
 msgid "Save As..."
 msgstr "Ment mint..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Nyomtat"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Tov�bb�t"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "Tov�bb�t"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Jel�l�s olvasottnak"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Jel�l�s nem olvasottnak"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Mapp�ba mozgat�s..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Mapp�ba m�sol�s..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Sz�r� a levelez� list�ra (%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/folder-browser.c:705
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Sz�r� a levelez� list�ra (%s)"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#: mail/mail-accounts.c:115
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "Nem tudom a wombat-ot elind�tani"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr " �sszegz�s"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "�j telefon t�pus"
+
+#: 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
+#, fuzzy
+msgid "maildir"
+msgstr "2. email"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Alap�rtelmezett"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+"T�nyleg t�r�lni akarod\n"
+"ezt a n�vjegyet?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+"T�nyleg t�r�lni akarod\n"
+"ezt a n�vjegyet?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 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
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Evol�ci� tennival� csatorna"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3651,12 +5562,16 @@ msgstr "A t�ma %s"
 msgid "Mail from %s"
 msgstr "Lev�l %s-t�l"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelez�lista"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Sz�r� szab�ly hozz�ad�sa"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3664,7 +5579,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -3673,7 +5588,7 @@ msgstr ""
 "Egy azonos�t�t be kell �ll�tanod\n"
 "miel�tt levelet k�ldessz."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -3682,15 +5597,11 @@ msgstr ""
 "Egy azonos�t�t be kell �ll�tanod\n"
 "miel�tt levelet k�ldessz."
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr "Nincs kimen� mapp�d be�ll�tva"
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3698,83 +5609,385 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 #, 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
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 #, 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:893
+#: mail/mail-callbacks.c:1088
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 #, fuzzy
 msgid "Print Message"
 msgstr "Lev�l _nyomtat�sa"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Lev�l _nyomtat�sa"
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "Email tartalmaz"
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid "Account Information"
+msgstr "Nincs inform�ci�"
+
+#: mail/mail-config.glade.h:3
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Halad�..."
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Authentication"
+msgstr "Authentik�ci�:"
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Authentik�ci�:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Be�ll�t�sok tesztel�se"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+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 ""
+"A levelez�si be�ll�t�sod most teljes.\n"
+"Kattints a 'Befejez' gombra a ment�shez"
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Alap�rtelmezett"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "Semmi"
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Email Address:"
+msgstr "Email c�m:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "Email c�m:"
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Levelez�s be�ll�t�sa"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Full Name:"
+msgstr "Teljes n�v:"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Hostname:"
+msgstr "Felhaszn�l�ln�v:"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Azonos�t�"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "Kil�p�s a lev�lszerkeszt�b�l"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "Mail"
+msgstr "_Lev�l"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Mail Account"
+msgstr "Email tartalmaz"
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr "Levelez�s be�ll�t�sa"
+
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Levelez�s be�ll�t�sa"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "_Minden olvasott lev�l kijel�l�se"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "News"
+msgstr "�j..."
+
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Optional"
+msgstr "Be�ll�t�sok"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Szervezet:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Password:"
+msgstr "Jelsz�"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "VCard-k�nt ment�s"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Email c�m:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Required"
+msgstr "_A k�rt emberek"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Save password"
+msgstr "VCard-k�nt ment�s"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Al��r�s f�jl:"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "A levelet HTML form�tumban k�ldd"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Sendmail"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Levelez�s be�ll�t�sa"
+
+#: mail/mail-config.glade.h:63
+#, fuzzy
+msgid "Server Type: "
+msgstr "Szerver:"
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Szerver:"
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Al��r�s f�jl:"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Signature:"
+msgstr "Al��r�s f�jl:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Forr�sok"
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "�ttetsz�"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Authentik�ci�:"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "T�pus"
+
+#: mail/mail-config.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.glade.h:75
+#, fuzzy
+msgid "User Information"
+msgstr "Nincs inform�ci�"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Felhaszn�l�ln�v:"
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#, fuzzy
+msgid "_Edit"
+msgstr "Szerkeszt"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "percek"
+
+#: mail/mail-config-druid.c:421
 #, 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
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "N�v:"
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3782,28 +5995,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-display.c:131
-#, fuzzy, c-format
-msgid "Could not write data: %s"
-msgstr "Nem tudom a dial�gust elk�sz�teni."
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 #, fuzzy
 msgid "Save Attachment"
 msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -3811,625 +6012,679 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Ment mint..."
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Megnyit..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 #, fuzzy
 msgid "External Viewer"
 msgstr "K�ls� k�nyvt�rak"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatol�s"
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Reply-To:"
+#: mail/mail-format.c:704
+#, fuzzy
+msgid "Loading message content"
+msgstr "A lev�l tov�bb�t�sa"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Hib�s �zenet az felad� threadt�l?"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lev�l elk�ld�se"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Nincs '%s' mappa."
+
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Megnyit..."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Mappa be�ll�t�sa"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 #, fuzzy
 msgid "Closing current folder"
 msgstr "_Mappa be�ll�t�sa"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 #, fuzzy
 msgid "Creating new folder"
 msgstr "�j mappa k�sz�t�se"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 #, fuzzy
 msgid "Copying messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "�j mappa k�sz�t�se"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "Nem tudom a dial�gust elk�sz�teni."
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "F�jl bet�lt�si hiba: %s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 #, fuzzy
 msgid "Working"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-ops.c:107
-#, fuzzy, c-format
-msgid "Fetching email from %s"
-msgstr "Levelek let�lt�se"
-
-#: mail/mail-ops.c:109
-#, fuzzy, c-format
-msgid "Fetch email from %s"
-msgstr "Levelek let�lt�se"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr ""
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evol�ci�"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' k�ld�s alatt"
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "A lev�l t�rl�se"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:825
 #, fuzzy, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid "Moving messages to %s"
 msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Mozgat�s alatt"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "M�sol�s alatt"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Nincs le�r�s)"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Szinkroniz�l�s"
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Lev�l lista rendez�se t�ma szerint"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s mappa t�lt�dik"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s mappa bet�lt�se"
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, 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:1935
+#: mail/mail-ops.c:1672
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1686
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "F�jl ment�si hiba: %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "M�gsem"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Nem teljes �zenet lett a cs�be �rva!"
+#: mail/mail-ops.c:1760
+#, fuzzy
+msgid "Saving attachment"
+msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:1775
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
+#: mail/mail-ops.c:1803
+#, fuzzy, c-format
+msgid "Could not write data: %s"
+msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Parancsok olvas�s�n�l hiba t�rt�nt egy felad� threadt�l."
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Keres�s"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Hib�s �zenet az felad� threadt�l?"
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "M�gsem"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Nem tudom a dial�gust elk�sz�teni."
+#: mail/mail-send-recv.c:231
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Sendmail"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "A lek�rdez�st megszak�tottad."
+#: mail/mail-send-recv.c:234
+#, fuzzy
+msgid "Receiving"
+msgstr "Fogad�s d�tuma"
 
-#: mail/mail-tools.c:189
-#, fuzzy, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "'%s' k�ld�s alatt"
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "M�gsem"
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr ""
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "% k�sz:"
 
-#: mail/mail-tools.c:347
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
+msgstr "Nem teljes �zenet lett a cs�be �rva!"
+
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (forwarded message)"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (no subject)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Forwarded message (no subject)"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VMapp�k"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "�j VMappa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "V�lasz"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "V�lasz k�ld�se a felad�nak erre a lev�lre"
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "V�lasz a felad�nak �s az �sszes c�mzettnek"
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "A lev�l tov�bb�t�sa"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "A lev�l nyomtat�sa"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "A lev�l t�rl�se"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Lev�l �r�sa"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Lev�l _nyomtat�sa"
+
+#: mail/message-list.c:952
 #, 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:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ismeretlen"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "csatol�s"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "From"
 msgstr "Felad�:"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Lej�rat"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Received"
 msgstr "Fogad�s d�tuma"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "To"
 msgstr "To:"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "Size"
 msgstr "M�ret:"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:92
 #, 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
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 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
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 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 siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %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
+
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
+
+#: mail/openpgp-utils.c:588
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1088
+#, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Mapp�k"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Pontsz�m"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, fuzzy, c-format
 msgid "Getting store for \"%s\""
 msgstr "_Indul�shoz"
 
-#: mail/subscribe-dialog.c:181
+#: mail/subscribe-dialog.c:280
 #, c-format
-msgid "Get store for \"%s\""
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Nem tudom be�ll�tani a helyi t�rter�letet -- %s"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "F�jln�v:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Mapp�k"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:309
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "Mozgat�s alatt"
+
+#: shell/importer/importer.c:327
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:342
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "F�jl bet�lt�si hiba: %s"
+
+#: shell/importer/importer.c:357
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+#, fuzzy
+msgid "Automatic"
+msgstr "_Automatikus kiszed�s"
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "F�jln�v:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Al��r�s f�jl:"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "F�jln�v:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Evol�ci� tennival� csatorna"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Evol�ci� tennival� csatorna"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
 msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
@@ -4459,7 +6714,8 @@ msgid "Evolution files successfully installed."
 msgstr "Az Evol�ci� f�jljai sikeresen telep�ltek."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "�gy l�tszik, els� alkalommal futtatod az Evol�ci�t."
 
 #: shell/e-setup.c:190
@@ -4510,7 +6766,7 @@ msgstr ""
 "K�rlek t�r�ld a f�jlt hogy az Evol�ci�\n"
 "telep�lni tudjon."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4519,11 +6775,11 @@ msgstr ""
 "Nem tudom elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "A megadott mappa n�v nem j�."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evol�ci� - �j mappa k�sz�t�se"
 
@@ -4535,7 +6791,7 @@ msgstr ""
 "A kiv�lasztott mappa t�pusa nem j� a megadott\n"
 "m�velethez."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "�j..."
 
@@ -4543,20 +6799,20 @@ msgstr "�j..."
 msgid "(Untitled)"
 msgstr "(N�vtelen)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "A Bug buddy-t nem tudom futtatni."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4566,24 +6822,24 @@ msgstr ""
 "levelez�shez, napt�r �s c�mjegyz�k funkci�kkal\n"
 "a GNOME grafikus k�rnyezethez."
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Mapp�ba menj..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Nincs mappa mutatva)"
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Mapp�k"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evol�ci� - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evol�ci� - %s"
@@ -4593,7 +6849,7 @@ 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:1212
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4676,87 +6932,92 @@ msgstr "Az elem aktiv�l�sa"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Nem siker�l elmenteni az elemeket."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_N�zet"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(n�vtelen)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Alapvet� hiba"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "A megadott mapp�t nem tal�lom"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott t�pus nem t�mogatott ebben a t�rol�ban."
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
+msgid "The Evolution shell."
+msgstr "Nem tudom elind�tani az Evol�ci� shell-t."
+
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hell�, k�sz�nj�k, hogy let�lt�tted az Evolution csomag fejleszt�i \n"
 "verzi�j�t.\n"
@@ -4767,18 +7028,18 @@ msgstr ""
 "k�sz, m�g nem.\n"
 "\n"
 "Mikor elind�tod az Evol�ci�t, k�rlek �rtsd meg, hogy a munk�nk nagy\n"
-"r�sze a backend (h�tt�r) �r�s�ra ir�nyult, amely az eg�sz rendszert\n"

-"hajtja, �s nem a felhaszn�l�i fel�letre. Ez csak a hegycs�cs teteje,\n"

-"�s m�g sok szeretetet fogunk bele�lni az UI fejleszt�r�be. Tudnod kell\n"

-"viszont, hogy amit haszn�lsz, nem demoware.\n"

-"Teh�t, itt az id� a menteget�z�sre. Az Evol�ci� fog: crash-elni, \n"

-"elveszti a leveleid, k�sza folyamatokat hagy futni, megeszi a teljes\n"

-"CPU id�det, HTML leveleket k�ld v�letlenszer� levlist�knak, �s lej�rat\n"

-"a kolleg�id �s a bar�taid el�tt. Haszn�ld a saj�t felel�ss�gedre.\n"

-"Az�rt rem�lj�k, �lvezni fogod a kem�ny munk�nk eredm�ny�t, �s v�rjuk\n"

-"hozz�j�rul�sod! \n"

-

-#: shell/main.c:101
+"r�sze a backend (h�tt�r) �r�s�ra ir�nyult, amely az eg�sz rendszert\n"
+"hajtja, �s nem a felhaszn�l�i fel�letre. Ez csak a hegycs�cs teteje,\n"
+"�s m�g sok szeretetet fogunk bele�lni az UI fejleszt�r�be. Tudnod kell\n"
+"viszont, hogy amit haszn�lsz, nem demoware.\n"
+"Teh�t, itt az id� a menteget�z�sre. Az Evol�ci� fog: crash-elni, \n"
+"elveszti a leveleid, k�sza folyamatokat hagy futni, megeszi a teljes\n"
+"CPU id�det, HTML leveleket k�ld v�letlenszer� levlist�knak, �s lej�rat\n"
+"a kolleg�id �s a bar�taid el�tt. Haszn�ld a saj�t felel�ss�gedre.\n"
+"Az�rt rem�lj�k, �lvezni fogod a kem�ny munk�nk eredm�ny�t, �s v�rjuk\n"
+"hozz�j�rul�sod! \n"
+
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4786,1887 +7047,2189 @@ msgstr ""
 "K�sz�nettel\n"
 "Az Evol�ci� Csapat\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nem tudom elind�tani az Evol�ci� shell-t."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Tilt�s."
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem tudom elind�tani a Bonobo komponens rendszert."
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Id�pont"
+msgid "Create new contact"
+msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Tal�lkoz� _felh�v�s"
+#: ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Delete a contact"
+msgstr "N�vjegy t�rl�se?"
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Lev�l"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+#, fuzzy
+msgid "Find"
+msgstr "Finnorsz�g"
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _C�mjegyz�k"
+#: ui/evolution-addressbook.xml.h:6
+#, fuzzy
+msgid "Find a contact"
+msgstr "N�vjegy t�rl�se?"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Feladat"
+#: ui/evolution-addressbook.xml.h:7
+#, fuzzy
+msgid "New contact"
+msgstr "A n�v tartalmaz"
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Feladat f_elh�v�s"
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "T�maszerinti lev�l lista"
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Napl� bejegyz�s"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Print contacts"
+msgstr "_N�vjegyek..."
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Feljegyz�s"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#, fuzzy
+msgid "Stop"
+msgstr "Pontsz�m"
 
-#: 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-addressbook.xml.h:13
+#, fuzzy
+msgid "Stop Loading"
+msgstr "�rnyal�s"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo st�lus"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "View All"
+msgstr "Mutasd mind"
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Nyomtat�si st�lusok defini�l�sa..."
+msgid "View all contacts"
+msgstr "N�vjegy t�rl�se?"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: _Elk�ld"
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Forr�s hozz�ad�sa"
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Csatol�sok me_nt�se..."
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_N�vjegyek..."
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mapp�ba mozgat..."
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+#, fuzzy
+msgid "_Print..."
+msgstr "Nyomtat"
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Mapp�ba m�so_l..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Oldal _be�ll�t�s:"
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Eszk�z�k"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Nyomtat�s n�_zet"
+#: ui/evolution-calendar.xml.h:1
+#, fuzzy
+msgid "5 Days"
+msgstr "Napok"
 
-#: ui/evolution-contact-editor.xml:63
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: _Speci�lis beilleszt�s"
+msgid "Alter preferences"
+msgstr "Napt�r be�ll�t�sok"
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Ne_m olvasottnak jel�l"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "A megbesz�l�s t�rl�se"
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objektum"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "�j mappa k�sz�t�se"
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elem"
+#: ui/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "Day"
+msgstr "Napok"
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Nem olvasott elem"
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "D�tumra ugr�s"
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Els� e_lem a mapp�ban"
+#: ui/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Go back in time"
+msgstr "K�vetkez� elemre ugr�s"
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Utols� elem a mapp�ban"
+#: ui/evolution-calendar.xml.h:9
+#, fuzzy
+msgid "Go forward in time"
+msgstr "Tov�bb�t"
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: �_ltal�nos"
+#: ui/evolution-calendar.xml.h:10
+#, fuzzy
+msgid "Go to a specific date"
+msgstr "D�tumra ugr�s"
 
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: __Form�z�s"
+msgid "Go to present time"
+msgstr "K�vetkez� elemre ugr�s"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Be�ll�t..."
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Month"
+msgstr "h�nap"
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "E_l�z�"
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
+msgstr "�j _id�pont"
 
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
-msgid "Ne_xt"
+msgid "Next"
 msgstr "K�_vetkez�"
 
-#: 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-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-calendar.xml.h:16
+#, fuzzy
+msgid "Open Calendar"
+msgstr "Napt�r megnyit�sa"
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Aktu�lis k�rd��v _tervez�se"
+#: ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Prev"
+msgstr "El�n�zet:"
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: K�rd��v t_ervez�se"
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Napt�r nyomtat�sa"
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: K�rd��v _publik�l�sa"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Print this Calendar"
+msgstr "Napt�r nyomtat�sa"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: K�rd��v publik�l�sa _mint..."
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Save As"
+msgstr "Ment�s"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Szkript _hibakeres�"
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Helyes�r�s..."
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Show 1 day"
+msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_K�rd��vek"
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Show 1 month"
+msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "FIXME: �_j n�vjegy"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show 1 week"
+msgstr "H�t sz�m�nak mutat�sa"
 
-#: 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-calendar.xml.h:29
+#, fuzzy
+msgid "Show the working week"
+msgstr "H�t sz�m�nak mutat�sa"
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Lev�l ennek a _szem�lynek"
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Ma"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Lev�l ennek a _szem�lynek"
+msgid "Week"
+msgstr "h�t"
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Ta_l�lkoz� ezzel a szem�llyel"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Megbesz�l�sek:"
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Tal�lkoz� tervez�se"
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#, fuzzy
+msgid "_New"
+msgstr "_N�zet"
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: �j feladat a n�vjegyhez"
+#: ui/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Napt�r megnyit�sa"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: �j napl� bejegyz�s a n�vjegyhez"
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "Ment mint..."
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _Z�szl� folytat�shoz..."
+#: ui/evolution-contact-editor.xml.h:2
+#, fuzzy
+msgid "Delete this item"
+msgstr "A megbesz�l�s t�rl�se"
 
-#: 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.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "T�r�l"
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: _Weblap megnyit�sa"
+#: ui/evolution-contact-editor.xml.h:4
+#, fuzzy
+msgid "Help"
+msgstr "_Otthoni"
 
-#: ui/evolution-contact-editor.xml:156
+#: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: _vCard-k�nt tov�bbk�ld"
+msgid "Print En_velope..."
+msgstr "Lev�l _nyomtat�sa"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Tov�bb�t"
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+#, fuzzy
+msgid "Print this item"
+msgstr "Tennival� szerkeszt�se"
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Beilleszt"
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#, fuzzy
+msgid "Print..."
+msgstr "Nyomtat"
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_orm�tum"
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+#, fuzzy
+msgid "Save _As..."
+msgstr "Ment mint..."
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Eszk�z�k"
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+#, fuzzy
+msgid "Save and Close"
+msgstr "Napt�r ment�se"
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_M�veletek"
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr "FIXME: El�z�"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Az el�z� elemre ugr�s"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-contact-editor.xml.h:13
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "FIXME: _Feljegyz�s"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "K�vetkez� elemre ugr�s"
+msgid "Send _message to contact..."
+msgstr "FIXME: �ze_net ennek a szem�lynek"
 
-#. 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"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "K�s�rleti"
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#, fuzzy
+msgid "_File"
+msgstr "_Mobil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Foglalt"
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+#, fuzzy
+msgid "_Save"
+msgstr "Ment�s"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "�zemen k�v�l"
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+#, fuzzy
+msgid "About this application"
+msgstr "Authentik�ci�:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nincs inform�ci�"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+#, fuzzy
+msgid "About..."
+msgstr "Bet�t�pus..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_M�sok megh�v�sa..."
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
+msgstr "_M�veletek"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Be�ll�t�sok"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#, fuzzy
+msgid "Address _Book... (FIXME)"
+msgstr "FIXME: _Bet�t�pus..."
 
-#: 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-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#, fuzzy
+msgid "C_lear"
+msgstr "Napt�r"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "_Nagy�tott mutat�sa"
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Szabad/foglalt friss�t�se"
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#, fuzzy
+msgid "Chec_k Names (FIXME)"
+msgstr "FIXME: _Feladat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#, fuzzy
+msgid "Clear"
+msgstr "Napt�r"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_Automatikus kiszed�s"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#, fuzzy
+msgid "Clear the selection"
+msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Close this appointment"
+msgstr "A megbesz�l�s 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"
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#, fuzzy
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Mapp�ba m�sol�s..."
 
-#: 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-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+#, fuzzy
+msgid "Copy"
+msgstr "V�llalat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_A k�rt emberek"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+#, fuzzy
+msgid "Copy the selection"
+msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: 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"
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Megbesz�l�s _kezd�dik:"
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+#, fuzzy
+msgid "Cut the selection"
+msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Megbesz�l�s _v�ge:"
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "A megbesz�l�s t�rl�se"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Minden megh�vott"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+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 "HKSCPsV"
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+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:21 ui/evolution-task-editor-dialog.xml.h:22
+#, fuzzy
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "FIXME: Els� e_lem a mapp�ban"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#, fuzzy
+msgid "For_ward (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Most"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Ma"
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
+msgstr "K�vetkez� elemre ugr�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"
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "Az el�z� elemre ugr�s"
 
-#. 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:26 ui/evolution-task-editor-dialog.xml.h:28
+#, fuzzy
+msgid "In_complete Task (FIXME)"
+msgstr "FIXME: _Feladat"
 
-#: widgets/misc/e-search-bar.c:176
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Keres�s"
+msgid "Modify the file's properties"
+msgstr "Tennival� lista be�ll�t�sai"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Csoportos�t�s %i"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+#, fuzzy
+msgid "N_ext"
+msgstr "K�_vetkez�"
 
-#~ msgid "Delete Contact?"
-#~ msgstr "N�vjegy t�rl�se?"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+#, fuzzy
+msgid "Paste"
+msgstr "Lap"
 
-#~ msgid "Address _2:"
-#~ msgstr "2.c�m:"
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr ""
 
-#~ msgid "Canada"
-#~ msgstr "Kanada"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "E_l�z�"
 
-#~ msgid "Check Address"
-#~ msgstr "A c�m ellen�rz�se"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+#, fuzzy
+msgid "Previous"
+msgstr "E_l�z�"
 
-#~ msgid "Countr_y:"
-#~ msgstr "Ors_z�g:"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Nyomtat�si el�n�zet"
 
-#~ msgid "Finland"
-#~ msgstr "Finnorsz�g"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Oldal be�ll�t�s:"
 
-#~ msgid "USA"
-#~ msgstr "USA"
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#, fuzzy
+msgid "Print Setup"
+msgstr "Oldal be�ll�t�s:"
 
-#~ msgid "_Address:"
-#~ msgstr "_C�m:"
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Ment�s"
 
-#~ msgid "_City:"
-#~ msgstr "_V�ros:"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#~ msgid "_PO Box:"
-#~ msgstr "_Postafi�k:"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+#, fuzzy
+msgid "Save the current file"
+msgstr "Jelenid�re ugr�s"
 
-#~ msgid "_State/Province:"
-#~ msgstr "�_llam/Helytart�s�g:"
+#: ui/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "_Ir�ny�t�sz�m:"
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Forr�s hozz�ad�sa"
+msgid "Select All"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "Find..."
-#~ msgstr "Keres�s..."
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#, fuzzy
+msgid "Select everything"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "Message Recipients"
-#~ msgstr "Lev�l c�mzettek"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr ""
 
-#~ msgid "Select Names"
-#~ msgstr "V�lassz neveket"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+msgstr "FIXME: Feladat f_elh�v�s"
 
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "V�lassz egy nevet a list�b�l:"
+msgid "_About..."
+msgstr "Bet�t�pus..."
 
-#~ msgid "123"
-#~ msgstr "123"
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#, fuzzy
+msgid "_Close"
+msgstr "Bez�r"
 
-#~ msgid "a"
-#~ msgstr "a"
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "b"
-#~ msgstr "b"
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#, fuzzy
+msgid "_Copy"
+msgstr "_V�llalat:"
 
-#~ msgid "c"
-#~ msgstr "c"
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr ""
 
-#~ msgid "d"
-#~ msgstr "d"
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Help"
+msgstr "_Otthoni"
 
-#~ msgid "e"
-#~ msgstr "e"
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "f"
-#~ msgstr "f"
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "g"
-#~ msgstr "g"
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "FIXME: _Utols� elem a mapp�ban"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "FIXME: _Lev�l"
 
-#~ msgid "i"
-#~ msgstr "i"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "Mapp�ba mozgat�s..."
 
-#~ msgid "j"
-#~ msgstr "j"
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "k"
-#~ msgstr "k"
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#, fuzzy
+msgid "_Paste"
+msgstr "_Vezet�kn�v:"
 
-#~ msgid "l"
-#~ msgstr "l"
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "_Print"
+msgstr "Nyomtat"
 
-#~ msgid "m"
-#~ msgstr "m"
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+#, fuzzy
+msgid "_Properties..."
+msgstr "�breszt� be�ll�t�sok"
 
-#~ msgid "n"
-#~ msgstr "n"
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "o"
-#~ msgstr "o"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "p"
-#~ msgstr "p"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "q"
-#~ msgstr "q"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "Forr�s hozz�ad�sa"
 
-#~ msgid "r"
-#~ msgstr "r"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
-#~ msgid "s"
-#~ msgstr "s"
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#~ msgid "t"
-#~ msgstr "t"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
-#~ msgid "u"
-#~ msgstr "u"
+#: ui/evolution-executive-summary.xml.h:5
+#, fuzzy
+msgid "New Mail"
+msgstr "R�szletek"
 
-#~ msgid "v"
-#~ msgstr "v"
+#: ui/evolution-mail.xml.h:2
+#, fuzzy
+msgid "Compose"
+msgstr "Bez�r"
 
-#~ msgid "w"
-#~ msgstr "w"
+#: ui/evolution-mail.xml.h:3
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Lev�l �r�sa"
 
-#~ msgid "x"
-#~ msgstr "x"
+#: ui/evolution-mail.xml.h:5
+#, fuzzy
+msgid "Copy message to a new folder"
+msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
-#~ msgid "y"
-#~ msgstr "y"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#~ msgid "z"
-#~ msgstr "z"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "�res napok:"
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
+#: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Sz�r� a felad�n"
 
-#~ msgid "Blank forms at end:"
-#~ msgstr "A v�g�n a formok �r�t�se:"
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Sz�r� a c�mzettekre"
 
-#~ msgid "Body"
-#~ msgstr "T�rzs"
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Sz�r� a t�m�ra"
 
-#~ msgid "Bottom:"
-#~ msgstr "Als�:"
+#: ui/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Forget _Passwords"
+msgstr "Jelsz�"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimenzi�k:"
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Forward As"
+msgstr "Tov�bb�t"
 
-#~ msgid "Font..."
-#~ msgstr "Bet�t�pus..."
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "Fejl�c"
 
-#~ msgid "Fonts"
-#~ msgstr "Bet�t�pusok"
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "A lev�l nyomtat�sa"
 
-#~ msgid "Footer:"
-#~ msgstr "L�bl�c:"
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "A lev�l nyomtat�sa"
 
-#~ msgid "Format"
-#~ msgstr "Form�tum"
+#: ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Forwarded message - %s"
 
-#~ msgid "Header"
-#~ msgstr "Fejl�c"
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
+msgstr ""
 
-#~ msgid "Header/Footer"
-#~ msgstr "Fejl�c/l�bl�c"
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Le�r�s:"
 
-#~ msgid "Headings"
-#~ msgstr "Fejl�cek"
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Jel�l�s olvasottnak"
 
-#~ msgid "Headings for each letter"
-#~ msgstr "Fejl�c minden lev�lnek"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Jel�l�s olvasottnak"
 
-#~ msgid "Height:"
-#~ msgstr "Magass�g:"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Jel�l�s nem olvasottnak"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "R�gt�n egym�s ut�n k�vetkeznek"
+#: ui/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Message _Display"
+msgstr "Megjelen�t�s sz�nei"
 
-#~ msgid "Include:"
-#~ msgstr "Bele�rtve:"
+#: ui/evolution-mail.xml.h:28
+#, fuzzy
+msgid "Move"
+msgstr "H"
 
-#~ msgid "Landscape"
-#~ msgstr "Fekv�"
+#: ui/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#~ msgid "Left:"
-#~ msgstr "Bal:"
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr ""
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Lev�l c�mk�k minden lapon"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Semmi"
 
-#~ msgid "Margins"
-#~ msgstr "Marg�k"
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
 
-#~ msgid "Number of columns:"
-#~ msgstr "Oszlopok sz�ma:"
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Mindenkinek"
 
-#~ msgid "Options"
-#~ msgstr "Be�ll�t�sok"
+#: ui/evolution-mail.xml.h:43
+#, fuzzy
+msgid "S_ource"
+msgstr "Forr�s"
 
-#~ msgid "Orientation"
-#~ msgstr "Elhelyezked�s"
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#, fuzzy
+msgid "Select _All"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "Page"
-#~ msgstr "Lap"
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "V�lassz mapp�t"
 
-#~ msgid "Page Setup:"
-#~ msgstr "Oldal be�ll�t�s:"
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "Paper"
-#~ msgstr "Pap�r"
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
-#~ msgid "Paper source:"
-#~ msgstr "Pap�r forr�s:"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Mutasd mind"
 
-#~ msgid "Portrait"
-#~ msgstr "�ll�"
+#: ui/evolution-mail.xml.h:50
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "T�maszerinti lev�l lista"
 
-#~ msgid "Preview:"
-#~ msgstr "El�n�zet:"
+#: ui/evolution-mail.xml.h:51
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "VMappa a felad�ra"
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Nyomat�s sz�rkesk�l�s �rnyal�ssal"
+#: ui/evolution-mail.xml.h:52
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "VMappa a c�mzettekre"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "P�ros lapokon ford�tott"
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "VMappa a t�m�ra"
 
-#~ msgid "Right:"
-#~ msgstr "Jobb:"
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
-#~ msgid "Sections:"
-#~ msgstr "Szekci�k:"
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Virtu�lis Mapp�k"
 
-#~ msgid "Shading"
-#~ msgstr "�rnyal�s"
+#: ui/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Actions"
+msgstr "_M�veletek"
 
-#~ msgid "Start on a new page"
-#~ msgstr "�j lapon kezdd"
+#: ui/evolution-mail.xml.h:57
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "Sz�r�k alkalmaz�sa"
 
-#~ msgid "Style name:"
-#~ msgstr "St�lus neve:"
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Bez�r"
 
-#~ msgid "Top:"
-#~ msgstr "Fels�:"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Mapp�ba m�sol�s..."
 
-#~ msgid "Type:"
-#~ msgstr "T�pus"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "A lev�lb�l gy�rts szab�lyt"
 
-#~ msgid "Width:"
-#~ msgstr "Sz�less�g:"
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Expunge"
+msgstr "_Tiszt�t"
 
-#~ msgid "label26"
-#~ msgstr "label26"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "Sz�r�k szerkeszt�se"
 
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Napt�r"
+msgid "_Folder"
+msgstr "Mapp�k"
 
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
+msgid "_Forward"
+msgstr "Tov�bb�t"
 
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Evol�ci� napt�r csatorna"
+msgid "_Invert Selection"
+msgstr "A kijel�lt mapp�k megtekint�se"
 
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
+msgid "_Mail Message"
+msgstr "FIXME: _Lev�l"
 
-#~ msgid "Edit appointment"
-#~ msgstr "_Id�pont szerkeszt�se"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "Be�ll�t�sok tesztel�se"
 
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Szundi id� (percek)"
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
+msgstr "Lev�lt�rzs"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 perc"
+#: ui/evolution-mail.xml.h:70
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "Mapp�ba mozgat�s..."
 
-#~ msgid "10 minutes"
-#~ msgstr "10 perc"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "A feladat megnyit�sa"
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 �r�s (de/du)"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#~ msgid "15 minutes"
-#~ msgstr "15 perc"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
 
-#~ msgid "24 hour"
-#~ msgstr "24 �r�s"
+#: ui/evolution-mail.xml.h:77
+#, fuzzy
+msgid "_Undelete"
+msgstr "Vissza�ll�t"
 
-#~ msgid "30 minutes"
-#~ msgstr "30 perc"
+#: ui/evolution-message-composer.xml.h:1
+#, fuzzy
+msgid "Attach"
+msgstr "F�jl csatol�sa"
 
-#~ msgid "60 minutes"
-#~ msgstr "60 perc"
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+#, fuzzy
+msgid "Close the current file"
+msgstr "Jelenid�re ugr�s"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Hang figyelmeztet�s"
+#: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Lev�l elk�ld�se"
 
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "S�polj a figyelmeztet� ablak megjelen�sekor."
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "F_orm�tum"
 
-#~ msgid "Calendar"
-#~ msgstr "Napt�r"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Napt�r be�ll�t�sok"
+#: ui/evolution-message-composer.xml.h:8
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Csatolj egy f�jlt a lev�lhez"
 
-#~ msgid "Colors"
-#~ msgstr "Sz�nek"
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
 
-#~ msgid "Compress weekends"
-#~ msgstr "A h�tv�g�k �sszenyom�sa"
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
+msgid "Open a file"
+msgstr "F�jl megnyit�s"
 
-#~ msgid "Date navigator options"
-#~ msgstr "D�tum navig�tor be�ll�t�sok"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
 
-#~ msgid "Defaults"
-#~ msgstr "Alap�rtelmezett"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
 
-#~ msgid "Display options"
-#~ msgstr "Megjelen�t�si be�ll�t�sok"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
-#~ msgid "Enable snoozing for"
-#~ msgstr "Szundi enged�se"
+msgid "Save in _folder... (FIXME)"
+msgstr "Mapp�ba mozgat�s..."
 
-#~ msgid "End of day:"
-#~ msgstr "Nap v�ge:"
+#: ui/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Mapp�ba mozgat�s..."
 
-#~ msgid "First day of week:"
-#~ msgstr "A h�t els� napja:"
+#: ui/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "Jelenid�re ugr�s"
 
-#~ msgid "Highlight"
-#~ msgstr "Kiemel�s"
+#: ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save the message in a specified folder"
+msgstr ""
+"Nem tudom elk�sz�teni a megadott mapp�t:\n"
+"%s"
 
-#~ msgid "Items Due Today"
-#~ msgstr "A ma lej�r� elemek"
+#: ui/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Send"
+msgstr "Felad�"
 
-#~ msgid "Items Due Today:"
-#~ msgstr "A ma lej�r� elemek:"
+#: ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send _Later"
+msgstr "Felad�"
 
-#~ msgid "Items Not Yet Due"
-#~ msgstr "M�g nem lej�rt elemek"
+#: ui/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _later"
+msgstr "Felad�"
 
-#~ msgid "Items Not Yet Due:"
-#~ msgstr "M�g nem lej�rt elemek:"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "A levelet HTML form�tumban k�ldd"
 
-#~ msgid "Overdue Items"
-#~ msgstr "Lej�rt elemek"
+#: ui/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the message later"
+msgstr "T�maszerinti lev�l lista"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Lej�rt elemek:"
+#: ui/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message now"
+msgstr "A levelet HTML form�tumban k�ldd"
 
-#~ msgid "Pick a color"
-#~ msgstr "V�lassz egy sz�nt"
+#: ui/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send this message now"
+msgstr "A lev�l t�rl�se"
 
-#~ msgid "Remind me of all appointments"
-#~ msgstr "Minden tal�lkoz�ra figyelmeztess"
+#: ui/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#~ msgid "Reminders"
-#~ msgstr "Eml�keztet�k"
+#: ui/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show _attachments"
+msgstr "csatol�s"
 
-#~ msgid "Show"
-#~ msgstr "Mutasd"
+#: ui/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show attachments"
+msgstr "csatol�s"
 
-#~ msgid "Show week numbers"
-#~ msgstr "H�t sz�m�nak mutat�sa"
+#: ui/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "A lev�l elment�se m�sik n�ven"
 
-#~ msgid "Start of day:"
-#~ msgstr "Nap kezdete:"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
 
-#~ msgid "TaskPad"
-#~ msgstr "FeladatT�bla"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
 
-#~ msgid "Time Until Due"
-#~ msgstr "Lej�ratig h�tral�v� id�"
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Az URI amit a Mappa B�ng�sz� meg fog nyitni"
 
-#~ msgid "Time divisions:"
-#~ msgstr "Id�oszt�sok:"
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
-#~ msgid "Time format:"
-#~ msgstr "Id� form�tum:"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Vizu�lis figyelmeztet�s"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
 
-#~ msgid "Work week"
-#~ msgstr "Munkah�t"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "minutes before they occur."
-#~ msgstr "perc bek�vetkez�s�kig."
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Beilleszt"
 
-#~ msgid "seconds."
-#~ msgstr "m�sodperc."
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr ""
 
-#~ msgid "% Comp_lete:"
-#~ msgstr "% k�sz:"
+#: ui/evolution-message-composer.xml.h:49
+#, fuzzy
+msgid "_Open..."
+msgstr "Megnyit..."
 
-#~ msgid "C_lassification:"
-#~ msgstr "B_esorol�s"
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Reply-To:"
 
-#~ msgid "Date Completed:"
-#~ msgstr "Teljes�t�s d�tuma:"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
 
-#~ msgid "High"
-#~ msgstr "Magas"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#~ msgid "In Progress"
-#~ msgstr "Folyamatban"
+#: ui/evolution-subscribe.xml.h:3
+#, fuzzy
+msgid "F_older"
+msgstr "Mapp�k"
 
-#~ msgid "Low"
-#~ msgstr "Alacsony"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
 
-#~ msgid "Normal"
-#~ msgstr "Norm�lis"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
 
-#~ msgid "Not Started"
-#~ msgstr "Nem indult m�g el"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
 
-#~ msgid "Task"
-#~ msgstr "Feladat"
+#: ui/evolution-subscribe.xml.h:8
+#, fuzzy
+msgid "Subscribe"
+msgstr "Forr�s"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_N�vjegyek..."
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
 
-#~ msgid "_Due Date:"
-#~ msgstr "Le_j�rat:"
+#: ui/evolution-task-editor-dialog.xml.h:5
+#, fuzzy
+msgid "Assig_n Task (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "_Priority:"
-#~ msgstr "_Priorit�s:"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
 
-#~ msgid "_Status:"
-#~ msgstr "_St�tusz:"
+#: ui/evolution-task-editor-dialog.xml.h:29
+#, fuzzy
+msgid "Meeting Re_quest (FIXME)"
+msgstr "FIXME: Tal�lkoz� _felh�v�s"
 
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
+#: ui/evolution-task-editor-dialog.xml.h:43
+#, fuzzy
+msgid "Redo"
+msgstr "R�di�"
 
-#~ msgid "A_ll day event"
-#~ msgstr "Minden napos esem�ny"
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:45
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Megbesz�l�sek:"
+msgid "Replace"
+msgstr "V�lasz"
 
-#~ msgid "Custom recurrence"
-#~ msgstr "Megadott ism�tl�d�s"
+#: ui/evolution-task-editor-dialog.xml.h:46
+#, fuzzy
+msgid "Replace a string"
+msgstr "V�lasz"
 
-#~ msgid "Days"
-#~ msgstr "Napok"
+#: ui/evolution-task-editor-dialog.xml.h:47
+#, fuzzy
+msgid "Reply to A_ll (FIXME)"
+msgstr "Mindenkinek"
 
-#~ msgid "Every"
-#~ msgstr "Minden"
+#: ui/evolution-task-editor-dialog.xml.h:48
+#, fuzzy
+msgid "S_end Status Report (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "Exceptions"
-#~ msgstr "Kiv�telek"
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
 
-#~ msgid "Hours"
-#~ msgstr "�r�k"
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr ""
 
-#~ msgid "Mail _to:"
-#~ msgstr "Lev�l _valakinek:"
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr ""
 
-#~ msgid "Minutes"
-#~ msgstr "Percek"
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr ""
 
-#~ msgid "Modify"
-#~ msgstr "M�dos�t�s"
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr ""
 
-#~ msgid "No recurrence"
-#~ msgstr "Nincs ism�tl�d�s"
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 #, fuzzy
-#~ msgid "Preview"
-#~ msgstr "El�n�zet:"
+msgid "_Appointment (FIXME)"
+msgstr "Megbesz�l�sek:"
 
-#~ msgid "Pri_vate"
-#~ msgstr "Szem�_lyes"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Nyil_v�nos"
+#: ui/evolution-task-editor-dialog.xml.h:77
+#, fuzzy
+msgid "_Mark Complete (FIXME)"
+msgstr "K�sznek jel�l"
 
-#~ msgid "Recurrence"
-#~ msgstr "Ism�tl�d�s"
+#: ui/evolution-task-editor-dialog.xml.h:84
+#, fuzzy
+msgid "_Reply (FIXME)"
+msgstr "N�vjegy szerkeszt�"
 
-#~ msgid "Recurrence Rule"
-#~ msgstr "Ism�tl�d�si szab�ly"
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Create a new task"
+msgstr "Egy �j n�vjegy k�sz�t�se"
 
-#~ msgid "Reminder"
-#~ msgstr "Eml�keztet�"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "New Task"
+msgstr "Feladat"
 
-#~ msgid "Simple recurrence"
-#~ msgstr "Egyszer� ism�tl�d�s"
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
 
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "�sszegz�s:"
+msgid "Tasks Preferences..."
+msgstr "Napt�r be�ll�t�sok"
 
-#~ msgid "Time"
-#~ msgstr "Id�"
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Feladat"
 
-#~ msgid "_Audio"
-#~ msgstr "_Hang"
+#: ui/evolution.xml.h:1
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Evol�ci�"
 
-#~ msgid "_Confidential"
-#~ msgstr "_Bizalmas"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Close this window"
+msgstr "A megbesz�l�s t�rl�se"
 
-#~ msgid "_Mail"
-#~ msgstr "_Lev�l"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#~ msgid "_Program"
-#~ msgstr "_Program"
+#: ui/evolution.xml.h:5
+#, fuzzy
+msgid "Customize"
+msgstr "FIXME: _Be�ll�t..."
 
-#~ msgid "_Run program:"
-#~ msgstr "_Program ind�t�sa:"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#~ msgid "_Start time:"
-#~ msgstr "_Kezd�si id�:"
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
 
-#~ msgid "_Starting date:"
-#~ msgstr "Ke_zd�si d�tum:"
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "E_xit"
+msgstr "Szerkeszt"
 
-#~ msgid "day(s)"
-#~ msgstr "nap"
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Evol�ci� napt�r csatorna"
 
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
 
-#~ msgid "for"
-#~ msgstr "ez�rt:"
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Nem indult m�g el"
 
-#~ msgid "forever"
-#~ msgstr "�r�kk�"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#~ msgid "label21"
-#~ msgstr "label21"
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#~ msgid "month(s)"
-#~ msgstr "h�napban"
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
 
-#~ msgid "until"
-#~ msgstr "am�g"
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
 
-#~ msgid "week(s)"
-#~ msgstr "h�ten"
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
 
-#~ msgid "year(s)"
-#~ msgstr "�vben"
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
 
+#: ui/evolution.xml.h:18
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "�prilis"
+msgid "Toggle whether to show the folder bar"
+msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
+#: ui/evolution.xml.h:19
 #, fuzzy
-#~ msgid "August"
-#~ msgstr "augusztus"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
+#: ui/evolution.xml.h:20
 #, fuzzy
-#~ msgid "December"
-#~ msgstr "december"
+msgid "Using the C_ontact Manager"
+msgstr "Napt�r nyomtat�sa"
 
+#: ui/evolution.xml.h:21
 #, fuzzy
-#~ msgid "February"
-#~ msgstr "febru�r"
+msgid "Using the _Calendar"
+msgstr "Napt�r nyomtat�sa"
 
+#: ui/evolution.xml.h:22
 #, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "D�tumra ugr�s"
+msgid "Using the _Mailer"
+msgstr "Napt�r nyomtat�sa"
 
+#: ui/evolution.xml.h:23
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Ugorj m�ra"
+msgid "Work Offline"
+msgstr "Mozgat�s alatt"
 
+#: ui/evolution.xml.h:24
 #, fuzzy
-#~ msgid "January"
-#~ msgstr "janu�r"
+msgid "_About Evolution..."
+msgstr "Evol�ci�"
 
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "July"
-#~ msgstr "j�lius"
+msgid "_Folder Bar"
+msgstr "Mapp�k"
 
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "June"
-#~ msgstr "j�nius"
+msgid "_Go to Folder..."
+msgstr "Mapp�ba menj..."
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "m�rcius"
+msgid "_Import file..."
+msgstr "�breszt� be�ll�t�sok"
 
+#: ui/evolution.xml.h:35
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "H�tf�"
+msgid "_Index"
+msgstr "_Beilleszt"
 
+#: ui/evolution.xml.h:36
 #, fuzzy
-#~ msgid "November"
-#~ msgstr "november"
+msgid "_Mail message"
+msgstr "Lev�lt�rzs"
 
+#: ui/evolution.xml.h:38
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "okt�ber"
+msgid "_New Folder"
+msgstr "�j VMappa"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "September"
-#~ msgstr "szeptember"
+msgid "_Shortcut Bar"
+msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#~ msgid "Attachment properties"
-#~ msgstr "Csatol�s be�ll�t�sok"
+#. 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 "File name:"
-#~ msgstr "F�jln�v:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Foglalt"
 
-#~ msgid "MIME type:"
-#~ msgstr "MIME t�pus:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "�zemen k�v�l"
 
-#~ msgid "Edit VFolders"
-#~ msgstr "VMapp�k szerkeszt�se"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Nincs inform�ci�"
 
-#~ msgid "Filter Rules"
-#~ msgstr "Sz�r� szab�lyok"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_M�sok megh�v�sa..."
 
-#, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "K�rvonal:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Be�ll�t�sok"
 
-#~ msgid "Virtual Folders"
-#~ msgstr "Virtu�lis Mapp�k"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Csak a _munka�r�k mutat�sa"
 
-#~ msgid "vFolder Sources"
-#~ msgstr "VMappa forr�sok"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "_Nagy�tott mutat�sa"
 
-#~ msgid "Save"
-#~ msgstr "Ment�s"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Szabad/foglalt friss�t�se"
 
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mutasd mind"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#, fuzzy
-#~ msgid "Hide selected"
-#~ msgstr "T�r�lt"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_Automatikus kiszed�s"
 
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Rejt�s"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "T�r�lt"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Minden ember �s er�forr�s"
 
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "T�ma"
+#: 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 "Hide from Sender"
-#~ msgstr "Sz�r� a felad�n"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_A k�rt emberek"
 
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Lev�l _nyomtat�sa"
+#: 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 "Hide Subject \"%s\""
-#~ msgstr "A t�ma %s"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Megbesz�l�s _kezd�dik:"
 
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Nem tudom a wombat-ot elind�tani"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Megbesz�l�s _v�ge:"
 
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr " �sszegz�s"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Minden megh�vott"
 
+#: widgets/menus/gal-view-menus.c:171
 #, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "�j telefon t�pus"
+msgid "_Current View"
+msgstr "Jelenid�re ugr�s"
 
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+#. 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 "Account Information"
-#~ msgstr "Nincs inform�ci�"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Csatol�s be�ll�t�sok"
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Most"
 
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Halad�..."
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Authentik�ci�:"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
 #, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Authentik�ci�:"
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: 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"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "Semmi"
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Email c�m:"
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Email c�m:"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
+#: widgets/misc/e-filter-bar.c:160
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Levelez�s be�ll�t�sa"
+msgid "Save Search"
+msgstr "Keres�s"
 
+#: widgets/misc/e-filter-bar.c:231
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Teljes n�v:"
+msgid "Advanced Search"
+msgstr "Halad�..."
 
+#: widgets/misc/e-filter-bar.c:311
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Felhaszn�l�ln�v:"
+msgid "Advanced ..."
+msgstr "Halad�..."
 
+#: widgets/misc/e-messagebox.c:141
 #, fuzzy
-#~ msgid "IMAP"
-#~ msgstr "IMAPv4"
-
-#~ msgid "Identity"
-#~ msgstr "Azonos�t�"
+msgid "Information"
+msgstr "Nincs inform�ci�"
 
+#: widgets/misc/e-messagebox.c:148
 #, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
+msgid "Warning"
+msgstr "Mozgat�s alatt"
 
+#: widgets/misc/e-messagebox.c:162
 #, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Lev�l"
+msgid "Question"
+msgstr "Le�r�s:"
 
+#: widgets/misc/e-messagebox.c:169
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Email tartalmaz"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Levelez�s be�ll�t�sa"
+msgid "Message"
+msgstr "Lev�lt�rzs"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Levelez�s be�ll�t�sa"
+msgid "Don't show this message again."
+msgstr "A lev�l t�rl�se"
 
+#: widgets/misc/e-search-bar.c:140
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "�j..."
+msgid "Sear_ch"
+msgstr "Keres�s"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Be�ll�t�sok"
-
-#~ msgid "Organization:"
-#~ msgstr "Szervezet:"
+msgid "The Personal Addressbook Server"
+msgstr "Forr�s hozz�ad�sa"
 
-#, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Jelsz�"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
+#: wombat/wombat.c:153
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Reply-To:"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Nem tudom a bonobo-t elind�tani"
 
+#: wombat/wombat.c:165
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "_A k�rt emberek"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Nem tudom a bonobo-t elind�tani"
 
+#: wombat/wombat.c:178
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "VCard-k�nt ment�s"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Al��r�s f�jl:"
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Sendmail"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX mbox form�tum� f�jlok"
 
 #, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Levelez�s be�ll�t�sa"
+#~ msgid "Connect to server"
+#~ msgstr "Nem tudom elind�tani a wombat kiszolg�l�t"
 
 #, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Szerver:"
+#~ msgid "New"
+#~ msgstr "�j..."
 
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Szerver:"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Nem tudom az Evol�ci� levelez� komponens�t elind�tani."
 
-#~ msgid "Signature file:"
-#~ msgstr "Al��r�s f�jl:"
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Notes komponens: A Bonobo inicializ�l�sa nem siker�lt"
 
-#, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Al��r�s f�jl:"
+#~ msgid "Disabled"
+#~ msgstr "Tiltva"
 
-#~ msgid "Sources"
-#~ msgstr "Forr�sok"
+#~ msgid "Synchronize"
+#~ msgstr "Szinkroniz�l�s"
 
-#, fuzzy
-#~ msgid "Type"
-#~ msgstr "T�pus"
+#~ msgid "Copy From Pilot"
+#~ msgstr " M�sol�s a pilotr�l"
 
-#, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Nincs inform�ci�"
+#~ msgid "Copy To Pilot"
+#~ msgstr "M�sol�s a pilotra"
 
-#~ msgid "Username:"
-#~ msgstr "Felhaszn�l�ln�v:"
+#~ msgid "Merge From Pilot"
+#~ msgstr "�sszevet�s a pilotr�l"
 
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "percek"
+#~ msgid "Merge To Pilot"
+#~ msgstr "�sszevet�s a pilotra"
 
-#~ msgid "Full name:"
-#~ msgstr "Teljes n�v:"
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Email address:"
-#~ msgstr "Email c�m:"
+#~ msgid "Original Author:"
+#~ msgstr "Eredeti tulajdonos:"
 
-#~ msgid "Signature File"
-#~ msgstr "Al��r�s f�jl"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "Server:"
-#~ msgstr "Szerver:"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 a Free Software Foundation �s a Helix Code"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "T�mogatott t�pusok detekt�l�sa..."
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
-#, fuzzy
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
+#~ msgid "Synchronize Action"
+#~ msgstr "Szinkroniz�ci�s elj�r�s"
 
-#~ msgid "Test Settings"
-#~ msgstr "Be�ll�t�sok tesztel�se"
+#~ msgid "Conduit state"
+#~ msgstr "Csatorna �llapot"
 
-#~ msgid "Mail source type:"
-#~ msgstr "Lev�l forr�s t�pusa:"
-
-#, fuzzy
-#~ msgid "News source type:"
-#~ msgstr "�j telefon t�pus"
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nincs pilot be�ll�tva, k�rlek v�laszd ki a\n"
+#~ "'Pilot Link Properties' cappletet el�sz�r."
 
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Lev�l k�ld�s"
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Nincs a gnome-pilot daemonra kapcsol�dva"
 
-#, fuzzy
-#~ msgid "Add Identity"
-#~ msgstr "Azonos�t�"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Hiba l�pett fel a pilotok list�j�nak\n"
+#~ "a gnome-pilot daemont�l val� lek�r�sekor "
 
 #, fuzzy
-#~ msgid "Edit Identity"
-#~ msgstr "Azonos�t�"
-
-#~ msgid "Add Source"
-#~ msgstr "Forr�s hozz�ad�sa"
-
-#~ msgid "Edit Source"
-#~ msgstr "Forr�s szerkeszt�se"
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Dr.\n"
+#~ "Prof.\n"
 
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "H�rcsoport-szerverek"
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ifj.\n"
+#~ "�zv.\n"
 
-#, fuzzy
-#~ msgid "Edit News Server"
-#~ msgstr "H�rcsoport-szerverek"
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evol�ci� napt�r csatorna"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "'%s' tesztel�se"
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Az Evol�ci� napt�r csatorna be�ll�t� eszk�ze.\n"
 
-#~ msgid "Address"
-#~ msgstr "C�m"
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evol�ci� tennival� csatorna"
 
-#~ msgid "Identities"
-#~ msgstr "Azonos�t�k"
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Az Evol�ci� tennival� csatorna be�ll�t� eszk�ze.\n"
 
-#~ msgid "Mail Sources"
-#~ msgstr "Lev�l forr�sok"
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "A priorit�s 1 �s 9 k�z�tt lehet, bez�r�lag"
 
-#~ msgid "Mail Transport"
-#~ msgstr "Lev�l k�ld�s"
+#~ msgid "Open..."
+#~ msgstr "Megnyit..."
 
 #, fuzzy
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "_Minden olvasott lev�l kijel�l�se"
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "�rd be a leveleid felad�j�t, amilyen c�mr�l levelezel"
 
-#~ 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."
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "�rd be a lev�l c�m�t (subject)"
 
 #, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "N�vjegy t�rl�se?"
+#~ msgid "Saving changes to message..."
+#~ msgstr "Lev�l ment�se"
 
 #, fuzzy
-#~ msgid "Find"
-#~ msgstr "Finnorsz�g"
+#~ msgid "Save changes to message..."
+#~ msgstr "Lev�l ment�se"
 
-#, fuzzy
-#~ msgid "Stop Loading"
-#~ msgstr "�rnyal�s"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Sz�r� szab�ly szerkeszt�se"
 
-#, fuzzy
-#~ msgid "View All"
-#~ msgstr "Mutasd mind"
+#~ msgid "Add Rule"
+#~ msgstr "Szab�ly hozz�ad�sa"
 
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Levelez�s be�ll�t�sa"
+#~ msgid "Add VFolder Rule"
+#~ msgstr "VMappa szab�ly hozz�ad�sa"
 
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "_N�vjegyek..."
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "VMappa szab�ly szerkeszt�se"
 
-#, fuzzy
-#~ msgid "5 Days"
-#~ msgstr "Napok"
+#~ msgid "Body or subject contains"
+#~ msgstr "A sz�vegt�rzs vagy a t�ma tartalmaz"
 
-#, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Napt�r be�ll�t�sok"
+#~ msgid "Body contains"
+#~ msgstr "A sz�vegt�rzs tartalmaz"
 
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Napt�r"
+#~ msgid "Subject contains"
+#~ msgstr "T�ma tartalmaz"
 
-#, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Napt�r be�ll�t�sok"
+#~ msgid "Body does not contain"
+#~ msgstr "A sz�vegt�rzs nem tartalmaz"
 
-#, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "A megbesz�l�s t�rl�se"
+#~ msgid "Subject does not contain"
+#~ msgstr "A t�ma nem tartalmaz"
 
-#, fuzzy
-#~ msgid "Create a new calendar"
-#~ msgstr "�j mappa k�sz�t�se"
+#~ msgid "You have no Outbox configured"
+#~ msgstr "Nincs kimen� mapp�d be�ll�tva"
 
 #, fuzzy
-#~ msgid "Day"
-#~ msgstr "Napok"
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr "Nem tudom a dial�gust elk�sz�teni."
 
 #, fuzzy
-#~ msgid "Go to"
-#~ msgstr "D�tumra ugr�s"
+#~ msgid "Fetching email from %s"
+#~ msgstr "Levelek let�lt�se"
 
 #, fuzzy
-#~ msgid "Go to a specific date"
-#~ msgstr "D�tumra ugr�s"
+#~ msgid "Fetch email from %s"
+#~ msgstr "Levelek let�lt�se"
 
 #, fuzzy
-#~ msgid "Go to present time"
-#~ msgstr "K�vetkez� elemre ugr�s"
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
 
-#, fuzzy
-#~ msgid "Month"
-#~ msgstr "h�nap"
+#~ msgid "(No description)"
+#~ msgstr "(Nincs le�r�s)"
 
 #, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "Napt�r megnyit�sa"
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "%s mappa t�lt�dik"
 
 #, fuzzy
-#~ msgid "Prev"
-#~ msgstr "El�n�zet:"
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "%s mappa bet�lt�se"
 
-#, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "Napt�r nyomtat�sa"
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "Parancsok olvas�s�n�l hiba t�rt�nt egy felad� threadt�l."
 
-#, fuzzy
-#~ msgid "Show 1 week"
-#~ msgstr "H�t sz�m�nak mutat�sa"
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr "Hib�s �zenet az felad� threadt�l?"
 
-#, fuzzy
-#~ msgid "Week"
-#~ msgstr "h�t"
+#~ msgid "Could not create dialog box."
+#~ msgstr "Nem tudom a dial�gust elk�sz�teni."
 
-#, fuzzy
-#~ msgid "_New"
-#~ msgstr "_N�zet"
+#~ msgid "User cancelled query."
+#~ msgstr "A lek�rdez�st megszak�tottad."
 
 #, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Napt�r megnyit�sa"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Id�pont"
 
-#, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Napt�r nyomtat�sa"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _C�mjegyz�k"
 
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Ment mint..."
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Feladat"
 
-#, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "A megbesz�l�s t�rl�se"
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: _Napl� bejegyz�s"
 
-#, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "T�r�l"
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Feljegyz�s"
 
-#, fuzzy
-#~ msgid "Print this item"
-#~ msgstr "Tennival� szerkeszt�se"
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: V�lassz f_orm�t..."
 
-#, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Nyomtat"
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "FIXME: _Memo st�lus"
 
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Ment mint..."
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "FIXME: Nyomtat�si st�lusok defini�l�sa..."
 
-#, fuzzy
-#~ msgid "Send _message to contact..."
-#~ msgstr "FIXME: �ze_net ennek a szem�lynek"
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: _Elk�ld"
 
-#, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Mobil"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Csatol�sok me_nt�se..."
 
-#, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Nyomtat"
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: _Mapp�ba mozgat..."
 
-#, fuzzy
-#~ msgid "_Save"
-#~ msgstr "Ment�s"
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: Mapp�ba m�so_l..."
 
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "Bet�t�pus..."
+#~ msgid "Page Set_up"
+#~ msgstr "Oldal _be�ll�t�s:"
 
-#, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Napt�r"
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Nyomtat�s n�_zet"
 
 #, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Napt�r"
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "FIXME: _Speci�lis beilleszt�s"
 
-#, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "A kijel�lt mapp�k megtekint�se"
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "FIXME: Ne_m olvasottnak jel�l"
 
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "A megbesz�l�s t�rl�se"
+#~ msgid "_Object"
+#~ msgstr "_Objektum"
 
-#, fuzzy
-#~ msgid "Copy"
-#~ msgstr "V�llalat"
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Elem"
 
-#, fuzzy
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Bet�t�pus..."
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: _Nem olvasott elem"
 
-#, fuzzy
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: _Feladat"
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: �_ltal�nos"
 
 #, fuzzy
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: K�vetkez�"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "FIXME: __Form�z�s"
 
-#, fuzzy
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: _Feladat"
+#~ msgid "_Toolbars"
+#~ msgstr "_Eszk�z�k"
 
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: _Elem"
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _F�jl..."
 
-#, fuzzy
-#~ msgid "FIXME: Rec_urrence..."
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: Elem..."
+
+#~ msgid "FIXME: _Object..."
 #~ msgstr "FIXME: _Objektum..."
 
-#, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Tennival� lista be�ll�t�sai"
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Bet�t�pus..."
 
-#, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "K�_vetkez�"
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: B_ekezd�s..."
 
-#, fuzzy
-#~ msgid "Paste"
-#~ msgstr "Lap"
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Aktu�lis k�rd��v _tervez�se"
 
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "E_l�z�"
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: K�rd��v t_ervez�se"
 
-#, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Oldal be�ll�t�s:"
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: K�rd��v _publik�l�sa"
 
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "�breszt� be�ll�t�sok"
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: K�rd��v publik�l�sa _mint..."
 
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "R�di�"
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: Szkript _hibakeres�"
 
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "V�lasz"
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Helyes�r�s..."
 
-#, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "Jelenid�re ugr�s"
+#~ msgid "_Forms"
+#~ msgstr "_K�rd��vek"
 
-#, fuzzy
-#~ msgid "Select All"
-#~ msgstr "V�lassz mapp�t"
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "FIXME: �_j n�vjegy"
 
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "V�lassz mapp�t"
+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "FIXME: �j n�vjegy ugyanann�l a _c�gn�l"
 
-#, fuzzy
-#~ msgid "_About..."
-#~ msgstr "Bet�t�pus..."
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "FIXME: Lev�l ennek a _szem�lynek"
 
 #, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Bez�r"
+#~ msgid "FIXME: New _Message to Contact"
+#~ msgstr "FIXME: Lev�l ennek a _szem�lynek"
 
-#, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "_V�llalat:"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "FIXME: Ta_l�lkoz� ezzel a szem�llyel"
 
-#, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Szerkeszt"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "FIXME: _Tal�lkoz� tervez�se"
 
-#, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Keres�s..."
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "FIXME: �j feladat a n�vjegyhez"
 
-#, fuzzy
-#~ msgid "_Help"
-#~ msgstr "_Otthoni"
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "FIXME: �j napl� bejegyz�s a n�vjegyhez"
 
-#, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "_Vezet�kn�v:"
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "FIXME: _Z�szl� folytat�shoz..."
 
-#, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Nyomtat"
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "FIXME: _T�rk�p vagy c�m megjelen�t�se"
 
-#, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "�breszt� be�ll�t�sok"
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: _Weblap megnyit�sa"
 
 #, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "R�di�"
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "FIXME: _vCard-k�nt tov�bbk�ld"
 
-#, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Bez�r"
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: _Tov�bb�t"
 
-#, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Lev�l �r�sa"
+#~ msgid "FIXME: Previous"
+#~ msgstr "FIXME: El�z�"
 
 #, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
-
-#, fuzzy
-#~ msgid "F_older"
-#~ msgstr "Mapp�k"
+#~ msgid "FIXME: Next"
+#~ msgstr "FIXME: _Feljegyz�s"
 
-#, fuzzy
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Sz�r� a felad�n"
+#~ msgid "Group %i"
+#~ msgstr "Csoportos�t�s %i"
 
-#, fuzzy
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Sz�r� a c�mzettekre"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#, fuzzy
-#~ msgid "Forget _Passwords"
-#~ msgstr "Jelsz�"
+#~ msgid "C_lassification:"
+#~ msgstr "B_esorol�s"
 
-#, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "R�szletek"
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
 
-#, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "A lev�l nyomtat�sa"
+#~ msgid "Days"
+#~ msgstr "Napok"
 
-#, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Forwarded message - %s"
+#~ msgid "Hours"
+#~ msgstr "�r�k"
 
-#, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "A lev�l nyomtat�sa"
+#~ msgid "Mail _to:"
+#~ msgstr "Lev�l _valakinek:"
 
-#, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "Sz�r�k szerkeszt�se"
+#~ msgid "Minutes"
+#~ msgstr "Percek"
 
-#, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Le�r�s:"
+#~ msgid "Time"
+#~ msgstr "Id�"
 
-#, fuzzy
-#~ msgid "Mar_k As Read"
-#~ msgstr "Jel�l�s olvasottnak"
+#~ msgid "_Audio"
+#~ msgstr "_Hang"
 
-#, fuzzy
-#~ msgid "Mark As U_nread"
-#~ msgstr "Jel�l�s nem olvasottnak"
+#~ msgid "_Mail"
+#~ msgstr "_Lev�l"
 
-#, fuzzy
-#~ msgid "Move"
-#~ msgstr "H"
+#~ msgid "_Program"
+#~ msgstr "_Program"
 
-#, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Lev�l(levelek) mozgat�sa m�s mapp�ba"
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
 
-#, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Nyomtat�si el�n�zet"
+#~ msgid "label21"
+#~ msgstr "label21"
 
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Lev�l _nyomtat�sa"
+#~ msgid "Show all hidden"
+#~ msgstr "Mutasd mind"
 
 #, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Mindenkinek"
+#~ msgid "Hide selected"
+#~ msgstr "T�r�lt"
 
 #, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Mindenkinek"
+#~ msgid "Hide deleted"
+#~ msgstr "T�r�lt"
 
 #, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "V�lassz mapp�t"
+#~ msgid "Hide Subject"
+#~ msgstr "T�ma"
 
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Mutasd mind"
+#~ msgid "Hide from Sender"
+#~ msgstr "Sz�r� a felad�n"
 
 #, fuzzy
-#~ msgid "Threaded Message list"
-#~ msgstr "T�maszerinti lev�l lista"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "A t�ma %s"
 
 #, fuzzy
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VMappa a felad�ra"
+#~ msgid "Account Properties"
+#~ msgstr "Csatol�s be�ll�t�sok"
 
 #, fuzzy
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VMappa a c�mzettekre"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Email c�m:"
 
 #, fuzzy
-#~ msgid "_Apply Filters"
-#~ msgstr "Sz�r�k alkalmaz�sa"
+#~ msgid "Reply-to:"
+#~ msgstr "Reply-To:"
 
 #, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Mapp�ba m�sol�s..."
+#~ msgid "Servers"
+#~ msgstr "Szerver:"
 
-#, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Lev�l _nyomtat�sa"
+#~ msgid "Full name:"
+#~ msgstr "Teljes n�v:"
 
-#, fuzzy
-#~ msgid "_Expunge"
-#~ msgstr "_Tiszt�t"
+#~ msgid "Signature File"
+#~ msgstr "Al��r�s f�jl"
 
-#, fuzzy
-#~ msgid "_Filter on Subject"
-#~ msgstr "Sz�r� a t�m�ra"
+#~ msgid "Server:"
+#~ msgstr "Szerver:"
 
-#, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Tov�bb�t"
+#~ msgid "Detect supported types..."
+#~ msgstr "T�mogatott t�pusok detekt�l�sa..."
 
 #, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Levelez�s be�ll�t�sa"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
 
-#, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Lev�lt�rzs"
+#~ msgid "Mail source type:"
+#~ msgstr "Lev�l forr�s t�pusa:"
 
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Mapp�ba mozgat�s..."
+#~ msgid "News source type:"
+#~ msgstr "�j telefon t�pus"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Lev�l _nyomtat�sa"
+#~ msgid "Mail transport type:"
+#~ msgstr "Lev�l k�ld�s"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Ment mint..."
+#~ msgid "Add Identity"
+#~ msgstr "Azonos�t�"
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Forr�s"
+#~ msgid "Edit Identity"
+#~ msgstr "Azonos�t�"
 
-#, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Vissza�ll�t"
+#~ msgid "Edit Source"
+#~ msgstr "Forr�s szerkeszt�se"
 
 #, fuzzy
-#~ msgid "_VFolder on Subject"
-#~ msgstr "VMappa a t�m�ra"
+#~ msgid "Add News Server"
+#~ msgstr "H�rcsoport-szerverek"
 
 #, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Virtu�lis Mapp�k"
+#~ msgid "Edit News Server"
+#~ msgstr "H�rcsoport-szerverek"
 
-#, fuzzy
-#~ msgid "Attach"
-#~ msgstr "F�jl csatol�sa"
+#~ msgid "Testing \"%s\""
+#~ msgstr "'%s' tesztel�se"
 
-#, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Jelenid�re ugr�s"
+#~ msgid "Identities"
+#~ msgstr "Azonos�t�k"
 
-#, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Lev�l elk�ld�se"
+#~ msgid "Mail Sources"
+#~ msgstr "Lev�l forr�sok"
 
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Csatolj egy f�jlt a lev�lhez"
+#~ msgid "Mail Transport"
+#~ msgstr "Lev�l k�ld�s"
 
-#, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "F�jl megnyit�s"
+#~ msgid "News Servers"
+#~ msgstr "H�rcsoport-szerverek"
 
-#, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Ment�s"
+#~ msgid "News Sources"
+#~ msgstr "H�rcsoport forr�sok"
 
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Mapp�ba mozgat�s..."
+#~ msgid "Send messages in HTML format"
+#~ msgstr "A levelet HTML form�tumban k�ldd"
 
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr ""
-#~ "Nem tudom elk�sz�teni a megadott mapp�t:\n"
-#~ "%s"
+#~ 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."
 
 #, fuzzy
-#~ msgid "Send"
-#~ msgstr "Felad�"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Levelez�s be�ll�t�sa"
 
 #, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Felad�"
+#~ msgid "Ca_lendar"
+#~ msgstr "Napt�r"
 
 #, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Felad�"
+#~ msgid "Open a calendar"
+#~ msgstr "Napt�r megnyit�sa"
 
 #, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "A levelet HTML form�tumban k�ldd"
+#~ msgid "_Print this calendar"
+#~ msgstr "Napt�r nyomtat�sa"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "T�maszerinti lev�l lista"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: K�vetkez�"
 
 #, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "A levelet HTML form�tumban k�ldd"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: _Elem"
 
 #, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "A lev�l t�rl�se"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _Objektum..."
 
 #, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "FIXME: Csatol�sok me_nt�se..."
+#~ msgid "_Find..."
+#~ msgstr "Keres�s..."
 
 #, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "csatol�s"
+#~ msgid "_Redo"
+#~ msgstr "R�di�"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "A lev�l elment�se m�sik n�ven"
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Sz�r� a felad�n"
 
 #, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Megnyit..."
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Sz�r� a c�mzettekre"
 
 #, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Szerkeszt"
+#~ msgid "Mar_k As Read"
+#~ msgstr "Jel�l�s olvasottnak"
 
 #, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evol�ci� napt�r csatorna"
+#~ msgid "Mark As U_nread"
+#~ msgstr "Jel�l�s nem olvasottnak"
 
 #, fuzzy
-#~ msgid "Getting _Started"
-#~ msgstr "Nem indult m�g el"
+#~ msgid "Print Preview of message..."
+#~ msgstr "Nyomtat�si el�n�zet"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Mindenkinek"
 
 #, fuzzy
-#~ msgid "Using the _Calendar"
-#~ msgstr "Napt�r nyomtat�sa"
+#~ msgid "Show _All messages"
+#~ msgstr "Mutasd mind"
 
 #, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evol�ci�"
+#~ msgid "_Edit Message"
+#~ msgstr "Lev�l _nyomtat�sa"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Megbesz�l�sek:"
+#~ msgid "_Filter on Subject"
+#~ msgstr "Sz�r� a t�m�ra"
 
 #, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "N�vjegy szerkeszt�"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Levelez�s be�ll�t�sa"
 
 #, fuzzy
-#~ msgid "_Folder"
-#~ msgstr "Mapp�k"
+#~ msgid "_Print Message"
+#~ msgstr "Lev�l _nyomtat�sa"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Mapp�ba menj..."
+#~ msgid "_Save Message As..."
+#~ msgstr "Ment mint..."
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "_Beilleszt"
+#~ msgid "_Source"
+#~ msgstr "Forr�s"
 
 #, 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:"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "VMappa a t�m�ra"
 
 #~ msgid "Available Categories:"
 #~ msgstr "Megl�v� mez�k"
@@ -6683,12 +9246,6 @@ msgstr "Csoportos�t�s %i"
 #~ msgid "Headings:"
 #~ msgstr "Fejl�cek:"
 
-#~ msgid "Empty days:"
-#~ msgstr "�res napok:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Megbesz�l�sek:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Kiemelt nap:"
 
@@ -6710,9 +9267,6 @@ msgstr "Csoportos�t�s %i"
 #~ msgid "may"
 #~ msgstr "m�jus"
 
-#~ msgid "sept"
-#~ msgstr "szept"
-
 #~ msgid "sunday"
 #~ msgstr "vas�rnap"
 
@@ -6824,16 +9378,6 @@ msgstr "Csoportos�t�s %i"
 #~ msgid "Mail Source"
 #~ msgstr "Lev�l forr�s"
 
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "A levelez�si be�ll�t�sod most teljes.\n"
-#~ "Kattints a 'Befejez' gombra a ment�shez"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "'%s' k�ld�se"
-
 #, fuzzy
 #~ msgid "Expunge \"%s\""
 #~ msgstr "_Tiszt�t"
@@ -6851,10 +9395,6 @@ msgstr "Csoportos�t�s %i"
 #~ msgstr "Kil�p�s a lev�lszerkeszt�b�l"
 
 #, fuzzy
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "A lev�l tov�bb�t�sa"
-
-#, fuzzy
 #~ msgid "Forward message \"%s\""
 #~ msgstr "A lev�l tov�bb�t�sa"
 
@@ -6871,18 +9411,10 @@ msgstr "Csoportos�t�s %i"
 #~ msgstr "Id� mutat�sa"
 
 #, fuzzy
-#~ msgid "Clear message display"
-#~ msgstr "Megjelen�t�s sz�nei"
-
-#, fuzzy
 #~ msgid "View messages from \"%s\""
 #~ msgstr "Lev�l meg_tekint�se"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Lev�l mozgat�sa m�s mapp�ba"
 
@@ -6890,23 +9422,12 @@ msgstr "Csoportos�t�s %i"
 #~ msgid "N_ew Directory Server"
 #~ msgstr "H�rcsoport-szerverek"
 
-#, fuzzy
-#~ msgid "_Actions"
-#~ msgstr "_M�veletek"
-
-#, fuzzy
-#~ msgid "_Save Calendar As"
-#~ msgstr "Napt�r ment�se"
-
 #~ msgid "window2"
 #~ msgstr "2.ablak"
 
 #~ msgid "Create to-do item"
 #~ msgstr "Tennival� k�sz�t�se"
 
-#~ msgid "Summary:"
-#~ msgstr "�sszegz�s:"
-
 #~ msgid "Due Date:"
 #~ msgstr "Lej�rat:"
 
@@ -6942,9 +9463,6 @@ msgstr "Csoportos�t�s %i"
 #~ "Az ezen k�v�les� id�pontok nem lesznek\n"
 #~ "megjelen�tve."
 
-#~ msgid "Day start:"
-#~ msgstr "Nap kezdete:"
-
 #~ msgid "Day end:"
 #~ msgstr "Nap v�ge:"
 
@@ -6975,12 +9493,6 @@ msgstr "Csoportos�t�s %i"
 #~ msgid "Beep on display alarms"
 #~ msgstr "�breszt� ki�r�s�n�l csipogj"
 
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "Hang �bresz�s id�z�t�se"
-
-#~ msgid " seconds"
-#~ msgstr " m�sodperc ut�n"
-
 #~ msgid "Enable snoozing for "
 #~ msgstr "Szundi enged�se"
 
@@ -7022,7 +9534,3 @@ msgstr "Csoportos�t�s %i"
 #~ "A levelez�si be�ll�t�saiddal kapcsolatos inform�ci�k\n"
 #~ "kit�lt�s�vel leveleket tudsz majd fogadni �s k�ldeni.\n"
 #~ "Kattints a 'K�vetkez�' gombra a folytat�shoz."
-
-#, fuzzy
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 8f8f8cbf93..38e2506c79 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,11 +4,10 @@
 # Gerard Oskamp <gerard@linuxfreak.nl>, 2000
 # Dennis Smit <synap@area101.penguin.nl>, 2000
 # Almer S. Tigelaar <almer@gnome.org>, 2000, 2001
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-02-24 19:28+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-02-24 19:27+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer@gnome.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,13 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-# addressbook/contact-editor/e-contact-editor.c:1283

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

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
@@ -63,7 +62,7 @@ msgstr ""
 "\n"
 "  Familie:      "
 
-# addressbook/contact-editor/fullname-strings.h:12

+# addressbook/contact-editor/fullname-strings.h:12
 #: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
@@ -80,7 +79,7 @@ msgstr ""
 "\n"
 "Geboorte Datum: "
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18

+# addressbook/contact-editor/e-contact-editor-strings.h:18
 #: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
@@ -169,7 +168,7 @@ msgstr ""
 "\n"
 "Telefoon:"
 
-# addressbook/contact-editor/e-contact-editor.c:1341

+# addressbook/contact-editor/e-contact-editor.c:1341
 #: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
@@ -178,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-# addressbook/contact-editor/e-contact-editor.c:1341

+# addressbook/contact-editor/e-contact-editor.c:1341
 #: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
@@ -203,7 +202,7 @@ msgstr ""
 "\n"
 "Tijdzone: "
 
-# addressbook/printing/e-contact-print.glade.h:12

+# addressbook/printing/e-contact-print.glade.h:12
 #: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
@@ -212,7 +211,7 @@ msgstr ""
 "\n"
 "Geografische Locatie: "
 
-# addressbook/contact-editor/e-contact-editor.c:1280

+# addressbook/contact-editor/e-contact-editor.c:1280
 #: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
@@ -229,8 +228,8 @@ msgstr ""
 "\n"
 "Org: "
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
@@ -271,7 +270,7 @@ msgstr ""
 "\n"
 "  Eenheid4: "
 
-# addressbook/contact-editor/categories-strings.h:7

+# addressbook/contact-editor/categories-strings.h:7
 #: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
@@ -280,7 +279,7 @@ msgstr ""
 "\n"
 "Categorie�n: "
 
-# calendar/gui/gncal-todo.c:207

+# calendar/gui/gncal-todo.c:207
 #: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
@@ -330,129 +329,13 @@ msgstr "Importeert GnomeCard bestanden naar Evolution."
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Uitgezet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopi�ren Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopi�ren Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mengen Uit Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mengen Naar Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Originele Auteur:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution Adresboek Kanaal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Configuratie programma voor het evolution adresboek kanaal.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Actie Synchronizeren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Kanaal status"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Niet verbonden met de gnome-pilot daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
@@ -478,338 +361,351 @@ msgstr "Kon \"wombat\" niet starten"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Configureer het adres kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution Adres kanaal"
-
-# addressbook/contact-editor/e-contact-editor-strings.h:11

+# addressbook/contact-editor/e-contact-editor-strings.h:11
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Toevoegen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:39

+# addressbook/contact-editor/e-contact-editor-strings.h:39
 #: addressbook/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "_Verjaardag:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:24

+# addressbook/contact-editor/e-contact-editor-strings.h:24
 #: addressbook/contact-editor/contact-editor.glade.h:3
 msgid "B_usiness"
 msgstr "_Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:21

+# addressbook/contact-editor/e-contact-editor-strings.h:21
 #: addressbook/contact-editor/contact-editor.glade.h:4
 msgid "Business _Fax"
 msgstr "Bedrijfs _Fax"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:26

+# addressbook/contact-editor/e-contact-editor-strings.h:26
 #: addressbook/contact-editor/contact-editor.glade.h:5
 msgid "C_ontacts..."
 msgstr "K_ontakten..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:27

+# addressbook/contact-editor/e-contact-editor-strings.h:27
 #: addressbook/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:3
 #: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie�n..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:13

+# addressbook/contact-editor/e-contact-editor-strings.h:13
 #: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Kontaken Bewerken"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:41

+# addressbook/contact-editor/e-contact-editor-strings.h:41
 #: addressbook/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Details"
 msgstr "Details"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:15

+# addressbook/contact-editor/e-contact-editor-strings.h:15
 #: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Opslaan Als:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:30

+# addressbook/contact-editor/e-contact-editor-strings.h:30
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Algemeen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10

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

+# addressbook/contact-editor/e-contact-editor-strings.h:10
+# addressbook/contact-editor/e-contact-editor-strings.h:12
 #: addressbook/contact-editor/contact-editor.glade.h:11
 msgid "New phone type"
 msgstr "Nieuw telefoon type"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:40

+# addressbook/contact-editor/e-contact-editor-strings.h:40
 #: addressbook/contact-editor/contact-editor.glade.h:12
 msgid "No_tes:"
 msgstr "Aa_ntekeningen:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:9

+# addressbook/contact-editor/e-contact-editor-strings.h:9
 #: addressbook/contact-editor/contact-editor.glade.h:13
 msgid "Phone Types"
 msgstr "Telefoon Typen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:23

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

+# addressbook/contact-editor/e-contact-editor-strings.h:23
+# addressbook/contact-editor/e-contact-editor.c:1340
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Primaire E-mail"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:17

+# addressbook/contact-editor/e-contact-editor-strings.h:17
 #: addressbook/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Ontvangt liever _HTML berichten"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:16

+# addressbook/contact-editor/e-contact-editor-strings.h:16
 #: addressbook/contact-editor/contact-editor.glade.h:16
 msgid "Web page address:"
 msgstr "Homepage:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:7

+# addressbook/contact-editor/e-contact-editor-strings.h:7
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Toevoegen"
 
-# composer/e-msg-composer-address-dialog.glade.h:11

+# composer/e-msg-composer-address-dialog.glade.h:11
 #: addressbook/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Adres..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:37

+# addressbook/contact-editor/e-contact-editor-strings.h:37
 #: addressbook/contact-editor/contact-editor.glade.h:19
 msgid "_Assistant's name:"
 msgstr "_Assistent:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:36

+# addressbook/contact-editor/e-contact-editor-strings.h:36
 #: addressbook/contact-editor/contact-editor.glade.h:20
 msgid "_Birthday:"
 msgstr "Ge_boortedatum:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:19

+# addressbook/contact-editor/e-contact-editor-strings.h:19
 #: addressbook/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
 msgstr "_Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:29

+# addressbook/contact-editor/e-contact-editor-strings.h:29
 #: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Bedrijf:"
 
-# 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
+# addressbook/contact-editor/e-contact-editor.c:673
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31

+# addressbook/contact-editor/e-contact-editor-strings.h:31
 #: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "Af_deling:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:14

+# addressbook/contact-editor/e-contact-editor-strings.h:14
 #: addressbook/contact-editor/contact-editor.glade.h:25
 msgid "_Full Name..."
 msgstr "_Volledige Naam..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:20

+# addressbook/contact-editor/e-contact-editor-strings.h:20
 #: addressbook/contact-editor/contact-editor.glade.h:26
 msgid "_Home"
 msgstr "T_huis"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:28

+# addressbook/contact-editor/e-contact-editor-strings.h:28
 #: addressbook/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "_Titel:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:38

+# addressbook/contact-editor/e-contact-editor-strings.h:38
 #: addressbook/contact-editor/contact-editor.glade.h:28
 msgid "_Manager's Name:"
 msgstr "_Manager:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:22

+# addressbook/contact-editor/e-contact-editor-strings.h:22
 #: addressbook/contact-editor/contact-editor.glade.h:29
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:34

+# addressbook/contact-editor/e-contact-editor-strings.h:34
 #: addressbook/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:32

+# addressbook/contact-editor/e-contact-editor-strings.h:32
 #: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Kant_oor:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

+# addressbook/contact-editor/e-contact-editor-strings.h:33
 #: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Beroep:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

+# addressbook/contact-editor/e-contact-editor-strings.h:35
 #: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_Echtgeno(o)t(e):"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:25

+# addressbook/contact-editor/e-contact-editor-strings.h:25
 #: addressbook/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
 msgstr "Dit is een email-adres"
 
-# addressbook/gui/component/addressbook.c:426

+# addressbook/gui/component/addressbook.c:426
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Contact verwijderen?"
 
-# addressbook/contact-editor/categories-strings.h:8

-#: addressbook/contact-editor/e-contact-editor.c:574
+# addressbook/contact-editor/categories-strings.h:8
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categori�en:"
 
-# addressbook/contact-editor/e-contact-editor.c:1278

-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+# addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Assistent"
 
-# addressbook/contact-editor/e-contact-editor.c:1279

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

-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+# addressbook/contact-editor/e-contact-editor.c:1279
+# addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+# addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1281

-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+# addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Bedrijfs Fax"
 
-# addressbook/contact-editor/e-contact-editor.c:1282

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

-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+# addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-# addressbook/contact-editor/e-contact-editor.c:1284

-#: addressbook/contact-editor/e-contact-editor.c:1283
+# addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Bedrijf"
 
-# addressbook/contact-editor/e-contact-editor.c:1285

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

-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+# addressbook/contact-editor/e-contact-editor.c:1285
+# addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Thuis"
 
-# addressbook/contact-editor/e-contact-editor.c:1286

-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+# addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Thuis 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1287

-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+# addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
-# addressbook/contact-editor/e-contact-editor.c:1288

-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+# addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
-# addressbook/contact-editor/e-contact-editor.c:1289

-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+# addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
-# addressbook/contact-editor/e-contact-editor.c:1290

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

-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+# addressbook/contact-editor/e-contact-editor.c:1290
+# addressbook/contact-editor/e-contact-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Overige"
 
-# addressbook/contact-editor/e-contact-editor.c:1291

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

-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+# addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Oppieper"
 
-# addressbook/contact-editor/e-contact-editor.c:1293

-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+# addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Eerste"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-mail 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1342

-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+# addressbook/contact-editor/e-contact-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-mail 3"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18

+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Filters Bewerken"
+
+# mail/mail-config.c:277
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Volledige Naam:"
+
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:18
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -818,7 +714,7 @@ msgstr "Adres _2:"
 msgid "Canada"
 msgstr "Canada"
 
-# composer/e-msg-composer-address-dialog.glade.h:11

+# composer/e-msg-composer-address-dialog.glade.h:11
 #: addressbook/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controleer Adres"
@@ -827,7 +723,7 @@ msgstr "Controleer Adres"
 msgid "Countr_y:"
 msgstr "_Land:"
 
-# addressbook/gui/component/addressbook.c:424

+# addressbook/gui/component/addressbook.c:424
 #: addressbook/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
@@ -836,12 +732,12 @@ msgstr "Finland"
 msgid "USA"
 msgstr "USA"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:18

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

+# addressbook/contact-editor/e-contact-editor-strings.h:36
 #: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Gemeente:"
@@ -858,7 +754,7 @@ msgstr "_Staat/Provincie:"
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-# addressbook/contact-editor/fullname-strings.h:7

+# addressbook/contact-editor/fullname-strings.h:7
 #: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Controleer Volledige Naam"
@@ -871,7 +767,7 @@ msgstr "Dr."
 msgid "Esq."
 msgstr "Mr."
 
-# addressbook/gui/component/alphabet.glade.h:14

+# addressbook/gui/component/alphabet.glade.h:14
 #: addressbook/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
@@ -888,7 +784,7 @@ msgstr "III"
 msgid "Jr."
 msgstr "Jr."
 
-# addressbook/gui/component/alphabet.glade.h:17

+# addressbook/gui/component/alphabet.glade.h:17
 #: addressbook/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Mejuffrouw"
@@ -909,55 +805,55 @@ msgstr "Jfr."
 msgid "Sr."
 msgstr "Hr."
 
-# addressbook/contact-editor/fullname-strings.h:9

+# addressbook/contact-editor/fullname-strings.h:9
 #: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "Voornaam:"
 
-# addressbook/contact-editor/fullname-strings.h:11

+# addressbook/contact-editor/fullname-strings.h:11
 #: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Achternaam:"
 
-# addressbook/contact-editor/fullname-strings.h:10

+# addressbook/contact-editor/fullname-strings.h:10
 #: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Tweede Naa_m:"
 
-# addressbook/contact-editor/fullname-strings.h:12

+# addressbook/contact-editor/fullname-strings.h:12
 #: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-# addressbook/contact-editor/fullname-strings.h:8

+# addressbook/contact-editor/fullname-strings.h:8
 #: addressbook/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-# addressbook/gui/component/addressbook.c:1046

-#: addressbook/gui/component/addressbook.c:230
+# addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Als _Minikaarten"
 
-# addressbook/gui/component/addressbook.c:499

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

-#: addressbook/gui/component/addressbook.c:236
+# addressbook/gui/component/addressbook.c:499
+# addressbook/gui/component/addressbook.c:1039
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Als _Tabel"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr "Voer het wachtwoord voor %s in"
 
-# addressbook/gui/component/addressbook.c:593

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

-#: addressbook/gui/component/addressbook.c:438
+# addressbook/gui/component/addressbook.c:598
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -977,34 +873,34 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 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:563 mail/folder-browser.c:223
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 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:594
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: addressbook/gui/component/addressbook.c:601
 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:595
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "E-mail bevat"
 
-# addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:738
+# addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
@@ -1012,17 +908,17 @@ msgstr "De URI die de Map Bladeraar zal laten zien"
 msgid "Other Contacts"
 msgstr "Andere Contacten"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:8

+# addressbook/gui/component/ldap-server-dialog.glade.h:8
 #: addressbook/gui/component/addressbook-config.c:143
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-# widgets/e-table/e-table-config.glade.h:10

+# widgets/e-table/e-table-config.glade.h:10
 #: addressbook/gui/component/addressbook-config.c:145
 msgid "File"
 msgstr "Bestand"
 
-# addressbook/gui/component/addressbook.c:593

+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "Unknown addressbook type"
 msgstr "Onbekend adresboek type"
@@ -1031,11 +927,11 @@ msgstr "Onbekend adresboek type"
 msgid "None (anonymous mode)"
 msgstr "Geen (anonieme modus)"
 
-# mail/folder-browser-factory.c:101

+# mail/folder-browser-factory.c:101
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1043,13 +939,13 @@ msgstr "Wachtwoord"
 msgid "SASL"
 msgstr "SASL"
 
-# shell/e-storage.c:434

+# shell/e-storage.c:434
 #: addressbook/gui/component/addressbook-config.c:165
 msgid "Unknown auth type"
 msgstr "Onbekende auth type"
 
-# composer/e-msg-composer-address-dialog.c:191

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

+# composer/e-msg-composer-address-dialog.c:191
+# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
 #: addressbook/gui/component/addressbook-config.c:174
 msgid "Base"
 msgstr "Basis"
@@ -1078,9 +974,9 @@ msgstr "FIXME Verbindings DN Help tekst hier"
 msgid "Remember this password"
 msgstr "Onthoud dit wachtwoord"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Computernaam:"
 
@@ -1088,7 +984,7 @@ msgstr "Computernaam:"
 msgid "FIXME Host help text here."
 msgstr "FIXME Computernaam help tekst hier."
 
-# calendar/gui/gncal-todo.c:190

+# calendar/gui/gncal-todo.c:190
 #: addressbook/gui/component/addressbook-config.c:404
 msgid "Port:"
 msgstr "Poort:"
@@ -1097,7 +993,7 @@ msgstr "Poort:"
 msgid "FIXME Port help text here."
 msgstr "FIXME Poort help tekst hier."
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:10

+# addressbook/gui/component/ldap-server-dialog.glade.h:10
 #: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "Stam DN:"
@@ -1106,20 +1002,20 @@ msgstr "Stam DN:"
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Stam DN help tekst hier."
 
-# composer/e-msg-composer-address-dialog.glade.h:9

+# composer/e-msg-composer-address-dialog.glade.h:9
 #: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Zoek Strekking:"
 
-# mail/mail-config.c:739 mail/mail-config.c:819

+# mail/mail-config.c:739 mail/mail-config.c:819
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Authenticatie:"
 
-# mail/mail-config.c:732

+# mail/mail-config.c:732
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Pad:"
 
@@ -1127,17 +1023,17 @@ msgstr "Pad:"
 msgid "FIXME Path Help text here"
 msgstr "FIXME Pad Help tekst hier"
 
-# composer/e-msg-composer.c:676

+# composer/e-msg-composer.c:676
 #: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr "Maak pad als het niet bestaat."
 
-# addressbook/gui/component/addressbook.c:593

+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr "Bewerk Adresboek"
 
-# addressbook/gui/component/addressbook.c:593

+# addressbook/gui/component/addressbook.c:593
 #: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr "Adresboek Toevoegen"
@@ -1150,10 +1046,10 @@ msgstr ""
 "Selecteer het soort adresboek dat je hebt en voer de relevante informatie "
 "erover in."
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1161,8 +1057,8 @@ msgstr "Naam:"
 msgid "FIXME Name help text here"
 msgstr "FIXME Naam help tekst hier"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #: addressbook/gui/component/addressbook-config.c:669
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
@@ -1173,34 +1069,34 @@ msgstr "Beschrijving:"
 msgid "FIXME Description help text here"
 msgstr "FIXME Beschrijving help tekst hier"
 
-# mail/mail-config.c:1490

+# mail/mail-config.c:1490
 #: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Adresboek Bronnen"
 
-# 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/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:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:696
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Verwijderen"
 
-# calendar/gui/gncal-todo.c:488

+# calendar/gui/gncal-todo.c:488
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:682 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Bewerken"
 
-# composer/e-msg-composer-address-dialog.glade.h:10

+# composer/e-msg-composer-address-dialog.glade.h:10
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Naam"
 
@@ -1208,37 +1104,53 @@ msgstr "Naam"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Andere Contacten"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control dat een Evolution minikaart adresboek weergeeft."
 
-# shell/e-shell-view-menu.c:369

-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# shell/e-shell-view-menu.c:369
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adresboek minikaart bekijker"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Een component voor het afhandelen van contacten."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabriek voor het Adresboek Minikaart control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Fabriek voor het Evolution adresboek component."
 
-# composer/e-msg-composer-hdrs.c:174

-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# composer/e-msg-composer-hdrs.c:174
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabriek voor het voorbeeld Adresboek control"
 
-# shell/e-shell-view-menu.c:369

+# shell/e-shell-view-menu.c:369
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "De adresboek naam selectie interface van Evolution."
@@ -1247,12 +1159,29 @@ msgstr "De adresboek naam selectie interface van Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-# addressbook/gui/component/addressbook.c:424

+# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Verwijderen"
+
+# composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+# addressbook/gui/component/addressbook.c:424
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Vind..."
 
-# composer/e-msg-composer-address-dialog.glade.h:7

+# composer/e-msg-composer-address-dialog.glade.h:7
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Geaddresseerden"
@@ -1265,229 +1194,229 @@ msgstr "Selecteer namen"
 msgid "Select name from:"
 msgstr "Selecteer naam van:"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

+# composer/e-msg-composer-address-dialog.glade.h:9
 #: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Zoeken"
 
-# addressbook/gui/component/alphabet.glade.h:8

+# addressbook/gui/component/alphabet.glade.h:8
 #: addressbook/gui/widgets/alphabet.glade.h:1
 msgid "123"
 msgstr "123"
 
-# addressbook/gui/component/alphabet.glade.h:9

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

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

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

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

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

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

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

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

+# addressbook/gui/component/alphabet.glade.h:16
+# calendar/cal-util/timeutil.c:98
 #: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-# addressbook/gui/component/alphabet.glade.h:17

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

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

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

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

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

+# addressbook/gui/component/alphabet.glade.h:22
 #: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-# addressbook/gui/component/alphabet.glade.h:23

+# addressbook/gui/component/alphabet.glade.h:23
 #: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-# addressbook/gui/component/alphabet.glade.h:24

+# addressbook/gui/component/alphabet.glade.h:24
 #: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-# addressbook/gui/component/alphabet.glade.h:25

+# addressbook/gui/component/alphabet.glade.h:25
 #: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-# addressbook/gui/component/alphabet.glade.h:26

+# addressbook/gui/component/alphabet.glade.h:26
 #: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-# addressbook/gui/component/alphabet.glade.h:27

+# addressbook/gui/component/alphabet.glade.h:27
 #: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-# addressbook/gui/component/alphabet.glade.h:28

+# addressbook/gui/component/alphabet.glade.h:28
 #: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-# addressbook/gui/component/alphabet.glade.h:29

+# addressbook/gui/component/alphabet.glade.h:29
 #: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-# addressbook/gui/component/alphabet.glade.h:30

+# addressbook/gui/component/alphabet.glade.h:30
 #: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-# addressbook/gui/component/alphabet.glade.h:31

+# addressbook/gui/component/alphabet.glade.h:31
 #: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-# addressbook/gui/component/alphabet.glade.h:32

+# addressbook/gui/component/alphabet.glade.h:32
 #: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-# addressbook/gui/component/alphabet.glade.h:33

+# addressbook/gui/component/alphabet.glade.h:33
 #: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-# addressbook/gui/component/alphabet.glade.h:34

+# addressbook/gui/component/alphabet.glade.h:34
 #: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
-# addressbook/gui/component/addressbook.c:943

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

-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+# addressbook/gui/component/addressbook.c:943
+# addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-# addressbook/gui/component/addressbook.c:1010

-#: addressbook/gui/widgets/e-addressbook-view.c:570
+# addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-# addressbook/contact-editor/e-contact-editor.c:1341

-#: addressbook/gui/widgets/e-addressbook-view.c:572
+# addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
 msgstr "E-mail"
 
-# mail/mail-config.c:328

-#: addressbook/gui/widgets/e-addressbook-view.c:576
+# mail/mail-config.c:328
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr "Web Site"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:31

-#: addressbook/gui/widgets/e-addressbook-view.c:589
+# addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr "Afdeling:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:32

-#: addressbook/gui/widgets/e-addressbook-view.c:590
+# addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr "Kantoor:"
 
-# addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/gui/widgets/e-addressbook-view.c:591
+# addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
 msgstr "Titel:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: addressbook/gui/widgets/e-addressbook-view.c:592
+# addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr "Beroep:"
 
-# addressbook/contact-editor/e-contact-editor.c:1292

-#: addressbook/gui/widgets/e-addressbook-view.c:593
+# addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr "Manager"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:34

-#: addressbook/gui/widgets/e-addressbook-view.c:595
+# addressbook/contact-editor/e-contact-editor-strings.h:34
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr "Aliasnaam:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: addressbook/gui/widgets/e-addressbook-view.c:596
+# addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr "Echtgeno(o)t(e):"
 
-# shell/e-shell-view.c:596

-#: addressbook/gui/widgets/e-addressbook-view.c:597
+# shell/e-shell-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr "Vrij-druk URL"
 
-# addressbook/gui/component/addressbook.c:1010

-#: addressbook/gui/widgets/e-addressbook-view.c:599
+# addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Click here to add a contact"
 msgstr "Klik hier om een contact toe te voegen"
 
-# addressbook/gui/component/addressbook.c:593

+# addressbook/gui/component/addressbook.c:593
 #: 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:129
+# addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1501,233 +1430,225 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-# addressbook/printing/e-contact-print.glade.h:23

+# addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Kaart: "
+
+# addressbook/printing/e-contact-print.glade.h:23
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:25

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

+# addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:3
 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:24
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Inhoud"
 
-# addressbook/printing/e-contact-print.glade.h:38

+# addressbook/printing/e-contact-print.glade.h:38
 #: addressbook/printing/e-contact-print.glade.h:5
 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:32
+# addressbook/printing/e-contact-print.glade.h:44
 #: addressbook/printing/e-contact-print.glade.h:6
 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: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:7
 msgid "Font..."
 msgstr "Lettertype..."
 
-# addressbook/printing/e-contact-print.glade.h:19

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

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

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

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

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

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

+# addressbook/printing/e-contact-print.glade.h:15
 #: addressbook/printing/e-contact-print.glade.h:14
 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:34
+# addressbook/printing/e-contact-print.glade.h:46
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Hoogte:"
 
-# addressbook/printing/e-contact-print.glade.h:13

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

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

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

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

+# addressbook/printing/e-contact-print.glade.h:14
 #: addressbook/printing/e-contact-print.glade.h:20
 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:36
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marges"
 
-# addressbook/printing/e-contact-print.glade.h:17

+# addressbook/printing/e-contact-print.glade.h:17
 #: addressbook/printing/e-contact-print.glade.h:22
 #: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-# addressbook/printing/e-contact-print.glade.h:10

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

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

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

+# addressbook/printing/e-contact-print.glade.h:7
 #: addressbook/printing/e-contact-print.glade.h:26
 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:29
+# addressbook/printing/e-contact-print.glade.h:50
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Paper"
 
-# addressbook/printing/e-contact-print.glade.h:35

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

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

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

+# addressbook/printing/e-contact-print.glade.h:27
 #: addressbook/printing/e-contact-print.glade.h:31
 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:55
 #: addressbook/printing/e-contact-print.glade.h:32
 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:40
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Rechts:"
 
-# addressbook/printing/e-contact-print.glade.h:12

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

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

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

+# addressbook/printing/e-contact-print.glade.h:16
 #: addressbook/printing/e-contact-print.glade.h:37
 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:8
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stijl Naam:"
 
-# addressbook/printing/e-contact-print.glade.h:37

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

-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
+# addressbook/printing/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:40
 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:33
+# addressbook/printing/e-contact-print.glade.h:45
 #: addressbook/printing/e-contact-print.glade.h:41
 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:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution Kalender Kanaal"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1738,144 +1659,142 @@ msgstr "Fout tijdens communiceren met kalender server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Configureer het GnomeCal kanaal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution Kalender kanaal"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Configureer het to-do kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo kanaal"
-
-# shell/e-shell-view-menu.c:369

-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo Kanaal"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-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
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

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

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

-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-# calendar/gui/calendar-commands.c:434

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

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

+# calendar/gui/calendar-commands.c:495
 #: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Kalender opslaan"
 
-#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kon het kalender aanzicht niet maken.  Controleer je ORBit en OAF "
 "instellingen."
 
-# calendar/gui/event-editor.c:1745

-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: 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"
-msgstr "%a %d-%m-%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-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:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d-%m-%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Publiekelijk"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Prive"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-# shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+# shell/e-storage.c:434
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-# calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:473
+# calendar/gui/print.c:326
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "O"
 
-# calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:475
+# calendar/gui/print.c:326
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "W"
 
-# mail/mail-config.c:1220

-#: calendar/gui/calendar-model.c:547
+# addressbook/printing/e-contact-print.glade.h:34
+# addressbook/printing/e-contact-print.glade.h:46
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Hoog"
+
+# addressbook/printing/e-contact-print.glade.h:28
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normaal"
+
+# calendar/gui/getdate.y:438
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Laag"
+
+# mail/mail-config.c:1220
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Niet Gestart"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "In Uitvoer"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Gedaan"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1886,36 +1805,25 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: 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"
-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:895
-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:898
-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:902
-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:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+# shell/e-shell-view.c:596
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1925,96 +1833,142 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 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:1105
-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/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-# addressbook/printing/e-contact-print.glade.h:28

-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normaal"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Ongedefini�erd"
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "Ja"
 
-# addressbook/gui/component/addressbook.c:420

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

-#: calendar/gui/calendar-model.c:1558
+# addressbook/gui/component/addressbook.c:420
+# calendar/gui/calendar-commands.c:544
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nee"
 
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/calendar-summary.c:197
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B, %Y"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-# composer/e-msg-composer.c:494

-#: calendar/gui/calendar-summary.c:438
+# composer/e-msg-composer.c:494
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Fout bij laden van kalender</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
 
-#: calendar/gui/calendar-summary.c:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "Weergave"
 
-# calendar/gui/event-editor.c:298

-#: calendar/gui/calendar-summary.c:625
+# calendar/gui/event-editor.c:298
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "Geef afspraken weer"
 
-# composer/e-msg-composer.c:906

-#: calendar/gui/calendar-summary.c:633
+# composer/e-msg-composer.c:906
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "Geef taken weer"
 
-# calendar/gui/print.c:1084

-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+# calendar/gui/print.c:1084
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Bezig met laden Kalender"
 
-# calendar/gui/control-factory.c:136

+# calendar/gui/control-factory.c:136
 #: calendar/gui/control-factory.c:126
 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/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+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/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Sluimeren"
+
+# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Fabriek voor de Evolution opsteller."
+
+# addressbook/backend/ebook/load-pine-addressbook.c:41
+# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Kon Gnome niet initialiseren"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:181
 #: 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:188
 #: 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/event-editor.c:294
 #: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Geen samenvatting beschikbaar."
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
 #: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
@@ -2022,57 +1976,57 @@ msgstr "Geen samenvatting beschikbaar."
 msgid "Close"
 msgstr "Sluiten"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:9

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

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

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

+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minuten"
 
-# calendar/gui/prop.c:335

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

+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuten"
 
-# calendar/gui/prop.c:336

+# calendar/gui/prop.c:336
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24 uurs"
 
-# calendar/gui/getdate.y:426

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

+# calendar/gui/getdate.y:426
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minuten"
 
-# calendar/gui/prop.c:803

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

+# calendar/gui/prop.c:780
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Audio Alarms"
 msgstr "Audio Alarmen"
@@ -2081,18 +2035,18 @@ msgstr "Audio Alarmen"
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/calendar-commands.c:659
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalender"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
-# calendar/gui/prop.c:522

+# calendar/gui/prop.c:522
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Kleuren"
@@ -2105,7 +2059,7 @@ msgstr "Weekeinden comprimeren"
 msgid "Date navigator options"
 msgstr "Datum navigator instellingen"
 
-# calendar/gui/prop.c:836

+# calendar/gui/prop.c:836
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Standaard instellingen"
@@ -2114,13 +2068,13 @@ msgstr "Standaard instellingen"
 msgid "Display options"
 msgstr "Weergave instellingen"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Verloop Datum"
 
-# calendar/gui/prop.c:820

+# calendar/gui/prop.c:820
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "Maak sluimeren mogelijk voor"
@@ -2133,23 +2087,23 @@ msgstr "Eind van dag:"
 msgid "First day of week:"
 msgstr "Eerste dag van de week:"
 
-# calendar/gui/gnome-month-item.c:741

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

+# calendar/gui/getdate.y:413
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Vrijdag"
 
-# calendar/gui/calendar-commands.c:60

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

+# calendar/gui/prop.c:648
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
 msgstr "Items die vandaag verlopen"
@@ -2166,18 +2120,18 @@ msgstr "Items die nog niet zijn verlopen"
 msgid "Items Not Yet Due:"
 msgstr "Items die nog niet zijn verlopen:"
 
-# calendar/gui/gnome-month-item.c:737

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

+# calendar/gui/prop.c:348
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Maandag"
 
-# calendar/gui/prop.c:642

+# calendar/gui/prop.c:642
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Overdue Items"
 msgstr "Verlopen items"
@@ -2190,16 +2144,15 @@ msgstr "Verlopen items:"
 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/gncal-todo.c:427 calendar/gui/prop.c:605
+# mail/message-list.c:474
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioriteit"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

+# 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:35
 msgid "Remind me of all appointments"
 msgstr "Herinner me van alle afspraken"
@@ -2209,14 +2162,14 @@ msgstr "Herinner me van alle afspraken"
 msgid "Reminders"
 msgstr "Herinneringen"
 
-# calendar/gui/gnome-month-item.c:742

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

+# calendar/gui/getdate.y:414
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -2224,29 +2177,29 @@ msgstr "Zaterdag"
 msgid "Show"
 msgstr "Weergeven"
 
-# calendar/gui/event-editor.c:298

+# calendar/gui/event-editor.c:298
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Show appointment end times"
 msgstr "Geef afspraak eindtijden weer"
 
-# calendar/gui/calendar-commands.c:528

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

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

+# calendar/gui/gnome-month-item.c:736
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sun"
 msgstr "Zon"
 
-# calendar/gui/prop.c:347

+# calendar/gui/prop.c:347
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -2254,60 +2207,60 @@ msgstr "Zondag"
 msgid "TaskPad"
 msgstr "TaakBlad"
 
-# calendar/gui/gnome-month-item.c:740

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

+# calendar/gui/getdate.y:410
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Donderdag"
 
-# calendar/gui/prop.c:606

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

+# calendar/gui/e-day-view-time-item.c:391
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time divisions:"
 msgstr "Tijd delingen:"
 
-# calendar/gui/prop.c:334

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

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

+# calendar/gui/getdate.y:406
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-# calendar/gui/prop.c:780

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

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

+# calendar/gui/getdate.y:408
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Woensdag"
 
-# calendar/gui/getdate.y:423

+# calendar/gui/getdate.y:423
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work week"
 msgstr "Werk week"
@@ -2316,7 +2269,7 @@ msgstr "Werk week"
 msgid "minutes before they occur."
 msgstr "minuten voor ze plaatsvinden."
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #: mail/mail-config.glade.h:84
 msgid "seconds."
@@ -2349,7 +2302,7 @@ msgstr "Weet je zeker dat je dagboek entry `%s' wilt verwijderen?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Weet je zeker dat je deze dagboek entry zonder naam wilt verwijderen?"
 
-# composer/e-msg-composer-attachment-bar.c:395

+# composer/e-msg-composer-attachment-bar.c:395
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Wil je de wijzingen opslaan?"
@@ -2359,51 +2312,23 @@ msgstr "Wil je de wijzingen opslaan?"
 msgid "% Comp_lete:"
 msgstr "% Af:"
 
-# filter/filter-editor.c:212

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classificatie"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Gedaan"
-
-# mail/message-list.c:502

+# mail/message-list.c:502
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
 msgstr "Datum & Tijd"
 
-# calendar/gui/gncal-todo.c:207

+# calendar/gui/gncal-todo.c:207
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 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:10
-msgid "High"
-msgstr "Hoog"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In Uitvoer"
-
-# calendar/gui/getdate.y:438

-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Laag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Niet Gestart"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2422,7 +2347,7 @@ msgstr "Pu_bliekelijk"
 msgid "Sta_rt Date:"
 msgstr "Be_gin Datum:"
 
-# calendar/gui/gncal-todo.c:171

+# calendar/gui/gncal-todo.c:171
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 #: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Su_mmary:"
@@ -2436,32 +2361,28 @@ msgstr "_Taak"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Ongedefini�erd"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:26

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

+# addressbook/contact-editor/e-contact-editor-strings.h:31
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "_Due Date:"
 msgstr "_Verloop Datum:"
 
-# calendar/gui/gncal-todo.c:190

+# calendar/gui/gncal-todo.c:190
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

+# addressbook/contact-editor/e-contact-editor-strings.h:35
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Status:"
 msgstr "_Status:"
@@ -2470,198 +2391,256 @@ msgstr "_Status:"
 msgid "Edit Task"
 msgstr "Taak Bewerken"
 
-# calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+# calendar/gui/event-editor.c:294
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Geen opsomming"
 
-# calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+# calendar/gui/event-editor.c:298
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-# calendar/gui/event-editor.c:301

-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+# calendar/gui/event-editor.c:301
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-# calendar/gui/event-editor.c:304

-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+# calendar/gui/event-editor.c:304
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboek Item - %s"
 
-# addressbook/contact-editor/categories-strings.h:7

-#: calendar/gui/e-calendar-table.c:154
+# addressbook/contact-editor/categories-strings.h:7
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Categorie�n"
 
-# calendar/gui/goto.c:264

-#: calendar/gui/e-calendar-table.c:156
+# calendar/gui/goto.c:264
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "Afmaak datum"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Eind Datum"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Begin Datum"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geografische Positie"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
 msgstr "Percentage compleet"
 
-# calendar/gui/gncal-todo.c:425

-#: calendar/gui/e-calendar-table.c:163
+# calendar/gui/gncal-todo.c:425
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Transparantheid"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-# calendar/gui/prop.c:780

-#: calendar/gui/e-calendar-table.c:166
+# calendar/gui/prop.c:780
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmen"
 
-# addressbook/gui/component/addressbook.c:1010

-#: calendar/gui/e-calendar-table.c:167
+# addressbook/gui/component/addressbook.c:1010
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Markeer als Gedaan"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Markeer de taak als gedaan"
 
-# calendar/gui/gncal-todo.c:326

-#: calendar/gui/e-calendar-table.c:404
+# calendar/gui/gncal-todo.c:326
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "Bewerk deze taak..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "Taak Bewerken"
 
-# 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:407
+# 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:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Verwijder deze taak"
 
-# 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:408
+# 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:560
 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:391
 #: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
 
-# calendar/gui/event-editor.c:1745

+# 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-# calendar/gui/event-editor.c:1745

+# 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:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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

+# 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543

+# 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:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-# calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324

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

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

-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+# 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:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nieuwe Afspraak..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Afspraak Plannen"
-
-# 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:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Bewerk deze afspraak..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Openen"
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+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:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Afspraak Plannen"
+
+# calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence 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:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+# calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+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:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
 #: calendar/gui/e-itip-control.c:153
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kon je kalender bestand niet updaten!\n"
 
-# shell/e-setup.c:88

+# shell/e-setup.c:88
 #: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
 msgid "Component successfully updated."
 msgstr "Component successvol ge-update."
@@ -2694,7 +2673,7 @@ msgstr "Kon je kalender store niet updaten."
 msgid "I couldn't delete the calendar component!\n"
 msgstr "I kon het kalender component niet verwijderen!\n"
 
-# shell/e-setup.c:88

+# shell/e-setup.c:88
 #: calendar/gui/e-itip-control.c:542
 msgid "Component successfully deleted."
 msgstr "Component successvol verwijderd."
@@ -2703,31 +2682,31 @@ msgstr "Component successvol verwijderd."
 msgid "I don't recognize this type of calendar component."
 msgstr "Type kalender component niet herkend."
 
-# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704

+# calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
 #: calendar/gui/e-itip-control.c:772
 msgid "Add to Calendar"
 msgstr "Toevoegen aan Kalender"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
 #: calendar/gui/e-itip-control.c:806
 msgid "Accept"
 msgstr "Accepteer"
 
-# 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/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-itip-control.c:807
 msgid "Decline"
 msgstr "Weiger"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:386

+# widgets/meeting-time-sel/e-meeting-time-sel.c:386
 #: calendar/gui/e-itip-control.c:808
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Experimenteel"
 
-# calendar/gui/calendar-commands.c:663

+# calendar/gui/calendar-commands.c:663
 #: calendar/gui/e-itip-control.c:852
 msgid "Update Calendar"
 msgstr "Kalender updaten"
@@ -2736,7 +2715,7 @@ msgstr "Kalender updaten"
 msgid "Cancel Meeting"
 msgstr "Afspraak annuleren"
 
-# calendar/gui/event-editor.c:1745

+# calendar/gui/event-editor.c:1745
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -2746,33 +2725,32 @@ msgstr "%P %%"
 msgid "--to--"
 msgstr "--naar--"
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/calendar-commands.c:659
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalender Bericht"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-# calendar/gui/print.c:1084

+# calendar/gui/print.c:1084
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Bezig met laden kalender..."
 
-# mail/mail-config.c:328

+# mail/mail-config.c:328
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Afzender"
 
-# calendar/gui/gncal-todo.c:171

+# calendar/gui/gncal-todo.c:171
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Opsomming:"
@@ -2781,22 +2759,22 @@ msgstr "Opsomming:"
 msgid "date-end"
 msgstr "einddatum"
 
-# calendar/gui/prop.c:385

+# calendar/gui/prop.c:385
 #: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "begindatum"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:2
 msgid "Attendee"
 msgstr "Aanwezige"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:3
 msgid "Attendee address"
 msgstr "Adres aanwezige"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:738

+# widgets/meeting-time-sel/e-meeting-time-sel.c:738
 #: calendar/gui/e-meeting-dialog.glade.h:4
 msgid "Attendees: "
 msgstr "Aanwezigen: "
@@ -2809,12 +2787,12 @@ msgstr ""
 "Annuleer\n"
 "Afspraak"
 
-# addressbook/contact-editor/e-contact-editor.c:1283

+# addressbook/contact-editor/e-contact-editor.c:1283
 #: calendar/gui/e-meeting-dialog.glade.h:7
 msgid "Chair"
 msgstr "Voorzitter"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

+# widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #: calendar/gui/e-meeting-dialog.glade.h:10
 msgid "Meeting Invitations"
 msgstr "Vergadering Uitnodigingen"
@@ -2823,12 +2801,12 @@ msgstr "Vergadering Uitnodigingen"
 msgid "Non-Participant"
 msgstr "Niet-Deelnemer"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: calendar/gui/e-meeting-dialog.glade.h:12
 msgid "Optional Participant"
 msgstr "Optionele Deelnemer"
 
-# mail/mail-config.c:328

+# mail/mail-config.c:328
 #: calendar/gui/e-meeting-dialog.glade.h:13
 msgid "Organizer: "
 msgstr "Organizator: "
@@ -2853,12 +2831,12 @@ msgstr ""
 "Verzoek\n"
 "Afspraak"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

+# widgets/meeting-time-sel/e-meeting-time-sel.c:565
 #: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Required Participant"
 msgstr "Benodigde Deelnemer"
 
-# addressbook/contact-editor/e-contact-editor.c:1289

+# addressbook/contact-editor/e-contact-editor.c:1289
 #: calendar/gui/e-meeting-dialog.glade.h:21
 msgid "Role"
 msgstr "Rol"
@@ -2871,28 +2849,28 @@ msgstr ""
 "Plan\n"
 "Tijd"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+# addressbook/contact-editor/e-contact-editor-strings.h:35
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Allen"
 
-# addressbook/contact-editor/categories-strings.h:7

-#: calendar/gui/e-tasks.c:150
+# addressbook/contact-editor/categories-strings.h:7
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, 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"
@@ -2904,16 +2882,22 @@ msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
 msgid "%d %B"
 msgstr "%d %B"
 
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Verwijder alle gebeurtenissen"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Gebeurtenis die de gehele dag plaatsvind"
 
-# calendar/gui/calendar-commands.c:59

+# calendar/gui/calendar-commands.c:59
 #: calendar/gui/event-editor-dialog.glade.h:3
 msgid "Appointment"
 msgstr "Afspraak"
 
-# calendar/gui/calendar-commands.c:59

+# calendar/gui/calendar-commands.c:59
 #: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Appointment Basics"
 msgstr "Afspraak Basis:"
@@ -2930,7 +2914,7 @@ msgstr "Elke"
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-# calendar/gui/prop.c:348

+# calendar/gui/prop.c:348
 #: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Modify"
 msgstr "Aanpassen"
@@ -2940,11 +2924,11 @@ msgid "No recurrence"
 msgstr "Geen herhaling"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-# addressbook/printing/e-contact-print.glade.h:9

+# addressbook/printing/e-contact-print.glade.h:9
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Voorbeeld"
@@ -2962,24 +2946,24 @@ msgid "Reminder"
 msgstr "Herinnering"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "Start een programma"
 
-# mail/mail-ops.c:374

+# mail/mail-ops.c:374
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "Verstuur een e-mail"
 
-# addressbook/printing/e-contact-print.glade.h:12

-#: calendar/gui/event-editor-dialog.glade.h:24
+# addressbook/printing/e-contact-print.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Instellingen..."
 
-# calendar/gui/calendar-commands.c:522

+# calendar/gui/calendar-commands.c:522
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "Laat een dialoogvenster zien"
 
@@ -2991,40 +2975,37 @@ msgstr "Eenvoudige herhaling"
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:601

+# widgets/meeting-time-sel/e-meeting-time-sel.c:601
 #: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-# calendar/gui/goto.c:264

+# calendar/gui/goto.c:264
 #: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Starting date:"
 msgstr "_Begin datum:"
 
-# filter/filter-editor.c:198

-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "na"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "voor"
 
-# calendar/gui/getdate.y:424

+# calendar/gui/getdate.y:424
 #: calendar/gui/event-editor-dialog.glade.h:35
 msgid "day(s)"
 msgstr "dag(en)"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
 #: calendar/gui/event-editor-dialog.glade.h:36
 msgid "end of appointment"
 msgstr "einde van afspraak"
 
-# calendar/gui/getdate.y:445

+# calendar/gui/getdate.y:445
 #: calendar/gui/event-editor-dialog.glade.h:37
 msgid "for"
 msgstr "voor"
@@ -3033,164 +3014,153 @@ msgstr "voor"
 msgid "forever"
 msgstr "oneindig"
 
-# calendar/gui/getdate.y:425

+# calendar/gui/getdate.y:425
 #: calendar/gui/event-editor-dialog.glade.h:39
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-# widgets/e-table/e-table-group.glade.h:9

+# calendar/gui/getdate.y:426
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-# addressbook/printing/e-contact-print.glade.h:31

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

-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "maand(en)"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:9

-#: calendar/gui/event-editor-dialog.glade.h:44
+# calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
-# shell/e-shell-folder-title-bar.c:355

-#: calendar/gui/event-editor-dialog.glade.h:45
+# shell/e-shell-folder-title-bar.c:355
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "totdat"
 
-# calendar/gui/getdate.y:423

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

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

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

-#: calendar/gui/event-editor.c:447
+# calendar/gui/gnome-month-item.c:737
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "op"
 
-# calendar/gui/getdate.y:424

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

-#: calendar/gui/event-editor.c:599
+# calendar/gui/getdate.y:421
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "op de"
 
-# calendar/gui/print.c:265

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

-#: calendar/gui/event-editor.c:752
+# calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen de Evolution niet kan bewerken."
 
-# calendar/gui/getdate.y:424

-#: calendar/gui/event-editor.c:1521
+# calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr " %d dagen"
 
-# calendar/gui/calendar-commands.c:522

-#: calendar/gui/event-editor.c:1523
+# calendar/gui/calendar-commands.c:522
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr " 1 dag"
 
-# calendar/gui/getdate.y:423

-#: calendar/gui/event-editor.c:1526
+# calendar/gui/getdate.y:423
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr " %d weken"
 
-# calendar/gui/calendar-commands.c:528

-#: calendar/gui/event-editor.c:1528
+# calendar/gui/calendar-commands.c:528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr " 1 week"
 
-# calendar/gui/getdate.y:425

-#: calendar/gui/event-editor.c:1531
+# calendar/gui/getdate.y:425
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr " %d uren"
 
-# calendar/gui/getdate.y:425

-#: calendar/gui/event-editor.c:1533
+# calendar/gui/getdate.y:425
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr " 1 uur"
 
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor.c:1536
+# calendar/gui/getdate.y:426
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr " %d minuten"
 
-# calendar/gui/getdate.y:426

-#: calendar/gui/event-editor.c:1538
+# calendar/gui/getdate.y:426
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr " 1 minuut"
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/event-editor.c:1541
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr " %d seconden"
 
-# calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: calendar/gui/event-editor.c:1543
+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr " 1 seconde"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1590
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr " voor het begin van een afspraak"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1592
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr " na het begin van een afspraak"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

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

-#: calendar/gui/event-editor.c:1600
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+# calendar/gui/gnome-cal.c:1120
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr " voor het eind van een afspraak"
 
-# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: calendar/gui/event-editor.c:1602
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr " na het eind van een afspraak"
 
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3198,7 +3168,7 @@ msgstr "%a %b %d %Y"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Een voorbeeld Bonobo control dat een kalender weergeeft."
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution kalender uitvoer samenvattings component."
@@ -3227,358 +3197,382 @@ msgstr "Fabriek voor het kalender iTip bekijk control"
 msgid "Factory for the sample Calendar control"
 msgstr "Fabriek voor het voorbeeld Kalender control"
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-# calendar/gui/getdate.y:394

+# calendar/gui/getdate.y:394
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-# calendar/gui/getdate.y:398

+# calendar/gui/getdate.y:398
 #: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Augustus"
 
-# calendar/gui/getdate.y:403

+# calendar/gui/getdate.y:403
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "December"
 
-# calendar/gui/getdate.y:392

+# calendar/gui/getdate.y:392
 #: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Februari"
 
-# calendar/gui/goto.c:264

+# calendar/gui/goto.c:264
 #: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Ga Naar Datum"
 
-# calendar/gui/goto.c:312

+# calendar/gui/goto.c:312
 #: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Ga Naar Vandaag"
 
-# calendar/gui/getdate.y:391

+# calendar/gui/getdate.y:391
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januari"
 
-# calendar/gui/getdate.y:397

+# calendar/gui/getdate.y:397
 #: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Juli"
 
-# calendar/gui/getdate.y:396

+# calendar/gui/getdate.y:396
 #: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Juni"
 
-# calendar/gui/getdate.y:393

+# calendar/gui/getdate.y:393
 #: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Maart"
 
-# calendar/gui/prop.c:348

+# calendar/gui/prop.c:348
 #: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mei"
 
-# calendar/gui/getdate.y:402

+# calendar/gui/getdate.y:402
 #: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "November"
 
-# calendar/gui/getdate.y:401

+# calendar/gui/getdate.y:401
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Oktober"
 
-# calendar/gui/getdate.y:399

+# calendar/gui/getdate.y:399
 #: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "September"
 
-# 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
-msgid "Could not initialize GNOME"
-msgstr "Kon Gnome niet initialiseren"
-
-# calendar/gui/print.c:265

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

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

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

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

-#: calendar/gui/print.c:295
+# calendar/gui/print.c:265
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5e"
 
-# calendar/gui/print.c:266

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

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

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

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

-#: calendar/gui/print.c:296
+# calendar/gui/print.c:266
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10e"
 
-# calendar/gui/print.c:267

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

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

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

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

-#: calendar/gui/print.c:297
+# calendar/gui/print.c:267
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15e"
 
-# calendar/gui/print.c:268

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

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

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

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

-#: calendar/gui/print.c:298
+# calendar/gui/print.c:268
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20ste"
 
-# calendar/gui/print.c:269

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

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

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

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

-#: calendar/gui/print.c:299
+# calendar/gui/print.c:269
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25ste"
 
-# calendar/gui/print.c:270

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

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

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

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

-#: calendar/gui/print.c:300
+# calendar/gui/print.c:270
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30ste"
 
-# calendar/gui/print.c:271

-#: calendar/gui/print.c:301
+# calendar/gui/print.c:271
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31ste"
 
-# calendar/gui/print.c:326

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

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

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

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

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

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

-#: calendar/gui/print.c:357
+# calendar/gui/print.c:326
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "_Taken"
 
-# calendar/gui/print.c:980

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

-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-# calendar/gui/event-editor.c:1745

-#: calendar/gui/print.c:1088
+# calendar/gui/event-editor.c:1745
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-# calendar/gui/print.c:1004

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

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

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

-#: calendar/gui/print.c:1151
+# calendar/gui/print.c:1084
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
-# calendar/gui/print.c:1249

-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+# calendar/gui/print.c:1249
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-# calendar/gui/control-factory.c:136

+# calendar/gui/control-factory.c:136
 #: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de takenmap om weer te geven"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
-# composer/e-msg-composer.c:474

+# composer/e-msg-composer.c:474
 #: camel/camel-filter-driver.c:790
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij taalkunding ontleden bestand: %s: %s"
 
-# composer/e-msg-composer.c:474

+# composer/e-msg-composer.c:474
 #: camel/camel-filter-driver.c:795
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-# composer/e-msg-composer.c:474

+# composer/e-msg-composer.c:474
 #: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filter zoekactie: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3587,7 +3581,7 @@ msgstr ""
 "Kan zoek expressie niet taalkunding ontleden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3596,16 +3590,16 @@ msgstr ""
 "Fout bij uitvoeren zoek expressie: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(past-allen) heeft een enkel bool resultaat nodig"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met uitvoeren van query op onbekende kop: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
@@ -3653,13 +3647,13 @@ msgstr "Kon tijdelijk post bestand %s niet openen: %s"
 msgid "Could not test lock file for %s: %s"
 msgstr "Kon het vergrendelings bestand voor %s niet testen: %s"
 
-# composer/e-msg-composer.c:494

+# composer/e-msg-composer.c:494
 #: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fout bij het lezen van post bestand: %s"
 
-# composer/e-msg-composer.c:474

+# composer/e-msg-composer.c:474
 #: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
@@ -3685,54 +3679,179 @@ msgstr "Kon niet starten: %s"
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma mislukt: %s"
 
-# shell/e-storage.c:434

+# shell/e-storage.c:434
 #: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Onbekende fout)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kon %s niet laden: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 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:176
+# mail/mail-config.c:1658
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-# filter/filter-editor.c:212

-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-# calendar/gui/calendar-commands.c:456

-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+# calendar/gui/calendar-commands.c:456
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operatie Geannuleerd"
 
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "Server verbrak de verbinding."
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authenticatie"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+# composer/e-msg-composer.c:494
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Fout bij het laden van filter informatie:\n"
+"%s"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "kalender informatie"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Deze optie zal verbinden met de SMTP server gebruik makend van CRAM-MD5 "
+"authenticatie."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
+"als platte tekst."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "De respons van de IMAP server bevatte geen %s informatie"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Het antwoord van de server eindigde te snel."
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
+"Kerberos 4 authenticatie."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kon Kerberos ticket niet vergaren:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr "Slechte authenticatie respons van server."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
+"als platte tekst."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3763,7 +3882,7 @@ msgstr "Computer %s niet gevonden."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
 
-# mail/folder-browser-factory.c:89

+# mail/folder-browser-factory.c:89
 #: camel/camel-session.c:54
 msgid "Virtual folder email provider"
 msgstr "Virtuele map e-mail aanbieder"
@@ -3773,13 +3892,13 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Voor het lezen van post als een query of een andere verzameling van mappen"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, 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:418
+# shell/e-setup.c:69
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3788,33 +3907,32 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "vPrullenbak"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL `%s' bevat geen protocol"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL `%s' bevat een ongeldig protocol"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Poort nummer in URL `%s' is niet numeriek"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kon Kerberos ticket niet vergaren:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Slechte authenticatie respons van server."
+msgid "No such message: %s"
+msgstr "Een dergelijk bericht bestaat niet: %s"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3826,8 +3944,8 @@ msgstr "Onverwachte respons van IMAP server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP commando mislukt: %s"
 
-# shell/e-storage.c:434

-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
+# shell/e-storage.c:434
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -3854,12 +3972,8 @@ msgstr "Kon samenvatting voor %s niet laden"
 msgid "Scanning IMAP folder"
 msgstr "Bezig met scannen IMAP map"
 
-#: camel/providers/imap/camel-imap-folder.c:457
-msgid "Synchronising IMAP folder"
-msgstr "Bezig met Synchronizeren IMAP map"
-
-#: camel/providers/imap/camel-imap-folder.c:726
-#: camel/providers/imap/camel-imap-folder.c:888
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3871,29 +3985,47 @@ 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:252
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Voor het lezen en opslaan van post op IMAP servers."
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
-"Kerberos 4 authenticatie."
+"Fout bij verbinden met de POP server.\n"
+"Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/imap/camel-imap-store.c:369
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Geen authenticatie vereist"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:397
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3904,8 +4036,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-# shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:674
+# shell/e-setup.c:69
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
@@ -3939,7 +4071,7 @@ msgstr "Voor het opslaan van lokale post in qmail maildir directories"
 msgid "Store root %s is not an absolute path"
 msgstr "Opslag locatie %s is geen absoluut pad"
 
-# composer/e-msg-composer.c:686

+# composer/e-msg-composer.c:686
 #: camel/providers/local/camel-local-store.c:135
 #, c-format
 msgid "Store root %s is not a regular directory"
@@ -3955,7 +4087,7 @@ msgstr "Kan map niet vergaren: %s: %s"
 msgid "Local stores do not have an inbox"
 msgstr "Lokale opslag locaties hebben geen postvak in"
 
-# composer/e-msg-composer.c:474

+# composer/e-msg-composer.c:474
 #: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
@@ -3983,7 +4115,7 @@ msgstr "Kon index bestand van map `%s' niet verwijderen: %s"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
 
-# mail/folder-browser-factory.c:41

+# mail/folder-browser-factory.c:41
 #: camel/providers/local/camel-maildir-folder.c:195
 #: camel/providers/local/camel-maildir-folder.c:207
 #: camel/providers/local/camel-maildir-folder.c:215
@@ -4005,7 +4137,7 @@ msgstr ""
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-# addressbook/contact-editor/e-contact-editor.c:782

+# addressbook/contact-editor/e-contact-editor.c:782
 #: camel/providers/local/camel-maildir-folder.c:216
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
@@ -4021,7 +4153,7 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:676

+# composer/e-msg-composer.c:676
 #: camel/providers/local/camel-maildir-store.c:98
 #: camel/providers/local/camel-mbox-store.c:99
 #: camel/providers/local/camel-mh-store.c:95
@@ -4065,7 +4197,7 @@ msgstr "Kon postvak niet openen: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox bestand toevoegen: %s: %s"
 
-# mail/folder-browser-factory.c:41

+# mail/folder-browser-factory.c:41
 #: camel/providers/local/camel-mbox-folder.c:333
 #: camel/providers/local/camel-mbox-folder.c:365
 #: camel/providers/local/camel-mbox-folder.c:378
@@ -4103,7 +4235,7 @@ msgstr ""
 "Kon bestand `%s' niet aanmaken:\n"
 "%s"
 
-# composer/e-msg-composer.c:686

+# composer/e-msg-composer.c:686
 #: camel/providers/local/camel-mbox-store.c:117
 #: camel/providers/local/camel-mbox-store.c:144
 #, c-format
@@ -4147,7 +4279,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1279
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Bezig met synchronizeren map"
 
@@ -4195,7 +4327,7 @@ msgstr "Kon de tijdelijke map niet sluiten: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-# shell/e-storage.c:434

+# shell/e-storage.c:434
 #: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
@@ -4229,7 +4361,7 @@ msgstr "Fout bij het versturen van de gebruikersnaam naar de server"
 msgid "Server rejected username/password"
 msgstr "Volgens de server is de gebruikernaam en/of het wachtwoord ongeldig"
 
-# calendar/gui/calendar-commands.c:434

+# calendar/gui/calendar-commands.c:434
 #: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
@@ -4283,7 +4415,7 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #: camel/providers/pop3/camel-pop3-folder.c:145
 msgid "Retrieving POP summary"
 msgstr "Bezig met ophalen POP samenvatting"
@@ -4297,7 +4429,7 @@ msgstr "Kon map niet openen: berichtenlijst was niet compleet."
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #: camel/providers/pop3/camel-pop3-folder.c:286
 #, c-format
 msgid "Retrieving POP message %d"
@@ -4320,7 +4452,21 @@ 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:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+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:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4329,7 +4475,7 @@ msgstr ""
 "vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
 "servers."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -4339,29 +4485,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:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 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:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, 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:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, 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:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4370,13 +4516,13 @@ msgstr ""
 "Fout bij het verbinden met de POP server.\n"
 "Fout bij versturen van gebruikersnaam: %s"
 
-# shell/e-storage.c:434

-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+# shell/e-storage.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4384,7 +4530,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4393,14 +4539,14 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4422,7 +4568,7 @@ msgstr "Kon kanaal naar sendmail niet maken: %s: bericht niet verstuurt"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kon sendmail niet starten: %s: bericht niet verstuurt"
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #: camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not send message: %s"
@@ -4443,16 +4589,21 @@ msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail stopte met staat %d: bericht niet verstuurt."
 
-# mail/folder-browser-factory.c:29

-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Kon bericht inhoud niet vinden in FETCH respons."
+
+# mail/folder-browser-factory.c:29
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 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.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4462,99 +4613,145 @@ msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand gebruik makend van SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
+"afstand gebruik makend van SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Spelfout, commando niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Spelfout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Commando niet ge�mplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Commando parameter niet ge�mplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Systeem status, of systeem help antwoord"
 
-# composer/e-msg-composer.c:894

-#: camel/providers/smtp/camel-smtp-transport.c:151
+# composer/e-msg-composer.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Help bericht"
 
-# addressbook/printing/e-contact-print.glade.h:52

-#: camel/providers/smtp/camel-smtp-transport.c:153
+# addressbook/printing/e-contact-print.glade.h:52
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Dienst klaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissie kanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissie kanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Verzochte post actie oke, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Verzochte mail actie niet genomen: mailbox niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Verzochte actie niet genomen: mailbox niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Verzochte actie niet genomen: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Verzochte post actie afgebroken: ruimte allocatie overschreden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Verzochte actie niet genomen: mailbox naam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start post invoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Geen wachtwoord ingevoerd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Fout bij verbinden met de POP server.\n"
+"Geen ondersteuning voor de ingestelde aanmeldings methode."
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Geen authenticatie vereist"
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Geen authenticatie vereist"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Welkom respons fout: %s: waarschijnlijk niet-fataal"
 
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
+
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Geen authenticatie vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4562,250 +4759,257 @@ msgstr ""
 "Deze optie zal verbinden met de SMTP server zonder gebruik te maken van "
 "authenticatie. Dit werkt prima met de meeste SMTP servers."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Deze optie zal verbinden met de SMTP server gebruik makend van CRAM-MD5 "
-"authenticatie."
-
-# mail/mail-config.c:1658

-#: camel/providers/smtp/camel-smtp-transport.c:378
+# mail/mail-config.c:1658
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Post aflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan bericht niet versturen: afzender niet gedefini�erd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO respons fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Time-out tijdens RSET verzoek: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Slechte authenticatie respons van server."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens MAIL FROM verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM respons fout: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens RCPT TO  verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO respons fout: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA verzoek: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA respons fout: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA respons fout: bericht afgebroken: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET verzoek: %s"
 
-# shell/e-storage.c:434

-#: camel/providers/smtp/camel-smtp-transport.c:786
+# shell/e-storage.c:434
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET respons fout: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Time-out tijdens QUIT verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT respons fout: %s: niet-fataal"
 
-# composer/e-msg-composer-attachment-bar.c:76

+# composer/e-msg-composer-attachment-bar.c:76
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-# composer/e-msg-composer-attachment-bar.c:78

+# composer/e-msg-composer-attachment-bar.c:78
 #: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-# composer/e-msg-composer-attachment-bar.c:85

+# composer/e-msg-composer-attachment-bar.c:85
 #: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-# composer/e-msg-composer-attachment-bar.c:89

+# composer/e-msg-composer-attachment-bar.c:89
 #: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-# composer/e-msg-composer-attachment-bar.c:93

+# composer/e-msg-composer-attachment-bar.c:93
 #: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-# composer/e-msg-composer-attachment-bar.c:299

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

+# composer/e-msg-composer.c:951
 #: composer/e-msg-composer-attachment-bar.c:413
 #: ui/evolution-message-composer.xml.h:2
 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:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Verwijderen"
-
-# composer/e-msg-composer-attachment-bar.c:363

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

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

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

+# composer/e-msg-composer-attachment-bar.c:299
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Bijvoegsel"
 
-# composer/e-msg-composer-attachment.glade.h:7

+# composer/e-msg-composer-attachment.glade.h:7
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment properties"
 msgstr "Attachment eigenschappen"
 
-# composer/e-msg-composer-attachment.glade.h:10

+# composer/e-msg-composer-attachment.glade.h:10
 #: composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
-# composer/e-msg-composer-attachment-bar.c:299

+# composer/e-msg-composer-attachment-bar.c:299
 #: composer/e-msg-composer-attachment.glade.h:5
 msgid "Inline attachment"
 msgstr "Ingebonden bijvoegsel"
 
-# composer/e-msg-composer-attachment.glade.h:8

+# composer/e-msg-composer-attachment.glade.h:8
 #: composer/e-msg-composer-attachment.glade.h:6
 msgid "MIME type:"
 msgstr "MIME type:"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Send as:"
 msgstr "Verstuur als:"
 
-# mail/message-list.c:488

-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+# composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Klik hier voor het adresboek"
+
+# mail/message-list.c:488
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Van:"
 
-# composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
+# mail/folder-browser-factory.c:34
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Antwoord-Naar:"
 
-# composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:387
-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:234
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Onderwerp:"
 
-# composer/e-msg-composer-hdrs.c:216

-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+# composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Aan:"
 
-# composer/e-msg-composer-hdrs.c:217

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

-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+# composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-# composer/e-msg-composer-hdrs.c:222

-#: composer/e-msg-composer-hdrs.c:397
+# composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:381
 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:402
+# composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-# composer/e-msg-composer-hdrs.c:228

-#: composer/e-msg-composer-hdrs.c:403
+# composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4813,17 +5017,7 @@ msgstr ""
 "Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
 "op de geadresseerden-lijst van het bericht verschijnen."
 
-# composer/e-msg-composer-hdrs.c:234

-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-# composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Geef het onderwerp van het bericht"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4832,30 +5026,30 @@ msgstr ""
 "Kon handtekenings bestand %s niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:680
+# composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-# composer/e-msg-composer.c:474

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

-#: composer/e-msg-composer.c:711
+# composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-# shell/e-shell-view-menu.c:159

-#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:159
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4865,33 +5059,33 @@ msgstr ""
 "\n"
 "Wil je je wijzingen opslaan?"
 
-# composer/e-msg-composer.c:561

-#: composer/e-msg-composer.c:822
+# composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Bestand openen"
 
-# composer/e-msg-composer.c:676

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

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

-#: composer/e-msg-composer.c:968
+# composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:995
 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:978
+# composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:1005
 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:1000
+# composer/e-msg-composer.c:729
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4899,39 +5093,100 @@ msgstr ""
 "Het bestand is zeer groot (groter dan 100K).\n"
 "Weet u zeker dat u het wil invoegen?"
 
-# composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:1021
+# composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:1048
 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:1264 composer/e-msg-composer.c:1499
+# composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
-# mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1580
+# mail/mail-threads.c:814
+#: composer/e-msg-composer.c:1765
 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:359
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+# mail/component-factory.c:196
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de post samensteller van Evolution niet initialiseren."
 
-# composer/e-msg-composer-address-dialog.glade.h:11

+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "De Evolution werkgroep suite"
+
+# composer/e-msg-composer-address-dialog.glade.h:11
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adres kaart"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "kalender informatie"
 
-# mail/component-factory.c:196

+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%d-%m-%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+# calendar/gui/event-editor.c:1745
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %d-%m-%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d-%m-%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+# mail/component-factory.c:196
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution component voor de uitvoer samenvatting."
@@ -4940,7 +5195,7 @@ msgstr "Evolution component voor de uitvoer samenvatting."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Fabriek voor het Evolution uitvoer samenvattings component."
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
@@ -4970,7 +5225,7 @@ msgstr "Open %s met de standaard Gnome applicatie"
 msgid "Open %s with the default GNOME web browser"
 msgstr "Open %s met de standaard Gnome web browser"
 
-# mail/mail-ops.c:374

+# mail/mail-ops.c:374
 #: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Send an email to %s"
@@ -4986,13 +5241,13 @@ msgstr "Verander het aanzicht naar %s"
 msgid "Run %s"
 msgstr "Start %s"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #: executive-summary/component/e-summary-url.c:75
 #, c-format
 msgid "Close %s"
 msgstr "Sluiten %s"
 
-# shell/e-shell-view-menu.c:402

+# shell/e-shell-view-menu.c:402
 #: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Move %s to the left"
@@ -5003,15 +5258,15 @@ msgstr "Verplaats %s naar links"
 msgid "Move %s to the right"
 msgstr "Verplaats %s naar rechts"
 
-# addressbook/contact-editor/e-contact-editor.c:857

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

+# addressbook/contact-editor/e-contact-editor.c:857
+# calendar/gui/event-editor.c:1340
 #: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Verplaats %s naar de vorige rij"
 
-# addressbook/contact-editor/e-contact-editor.c:860

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

+# addressbook/contact-editor/e-contact-editor.c:860
+# calendar/gui/event-editor.c:1342
 #: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the next row"
@@ -5031,7 +5286,7 @@ msgstr ""
 "Kan HTML bestand niet openen:\n"
 "%s"
 
-# composer/e-msg-composer.c:494

+# composer/e-msg-composer.c:494
 #: executive-summary/component/e-summary.c:932
 #, c-format
 msgid ""
@@ -5068,7 +5323,7 @@ msgstr ""
 msgid "Factory for the RDF summary."
 msgstr "Fabriek voor de RDF samenvatting."
 
-# calendar/gui/gncal-todo.c:425

+# calendar/gui/gncal-todo.c:425
 #: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
 msgid "RDF Summary"
 msgstr "RDF Samenvatting"
@@ -5089,7 +5344,7 @@ msgstr "Test bonobo dienst"
 msgid "Test service"
 msgstr "Test dienst"
 
-# shell/e-storage.c:412

+# shell/e-storage.c:412
 #: executive-summary/test-service/rdf-summary.c:509
 #: executive-summary/test-service/rdf-summary.c:546
 #: executive-summary/test-service/rdf-summary.c:591
@@ -5105,73 +5360,73 @@ msgstr "Update automatisch"
 msgid "Update now"
 msgstr "Update nu"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:473

+# widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #: executive-summary/test-service/rdf-summary.c:785
 msgid "Update every "
 msgstr "Update elke "
 
-# calendar/gui/getdate.y:426

+# calendar/gui/getdate.y:426
 #: executive-summary/test-service/rdf-summary.c:793
 #: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuten"
 
-# calendar/gui/getdate.y:420

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

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

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

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

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

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

+# calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dagen"
 
-# calendar/gui/getdate.y:425

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

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

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

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

+# calendar/gui/prop.c:814 calendar/gui/prop.c:831
 #: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " seconden"
@@ -5212,7 +5467,7 @@ msgstr ""
 "een tijd relatief aan het moment dat de filter word gestart;\n"
 "\"een week geleden\", bijvoorbeeld."
 
-# calendar/gui/calendar-commands.c:553

+# calendar/gui/calendar-commands.c:553
 #. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:357
 msgid "the current time"
@@ -5231,55 +5486,34 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
-# calendar/gui/getdate.y:438

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

+# addressbook/gui/component/addressbook.c:1010
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
-# mail/mail-config.c:1490

-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Filter Regel Toevoegen"
-
-# filter/filter-editor.c:198

-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Bewerk VMap Regel"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "inkomend"
-
-# calendar/gui/calendar-commands.c:56

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

-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filters Bewerken"
+# mail/mail-config.c:1490
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filter Regels"
 
-# calendar/gui/print.c:326

+# calendar/gui/print.c:326
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Dan"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: filter/filter-filter.c:416
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Actie Toevoegen"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Deze Actie Verwijderen"
 
@@ -5291,7 +5525,7 @@ msgstr ""
 "Oops, je bent vergeten een map te kiezen.\n"
 "Ga terug en specificeer een geldige map om mail in af te leveren."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -5316,495 +5550,442 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-# composer/e-msg-composer-attachment.glade.h:10

-#: filter/filter-rule.c:530
+# composer/e-msg-composer-attachment.glade.h:10
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Regel naam: "
 
-# shell/e-shell-folder-title-bar.c:355

-#: filter/filter-rule.c:534
+# shell/e-shell-folder-title-bar.c:355
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Geen Titel"
 
-# addressbook/gui/component/alphabet.glade.h:14

-#: filter/filter-rule.c:550
+# addressbook/gui/component/alphabet.glade.h:14
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: filter/filter-rule.c:587
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
-# mail/folder-browser-factory.c:35

+# mail/folder-browser-factory.c:35
 #: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Belangrijk"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

+# addressbook/contact-editor/e-contact-editor.c:1294
 #: filter/filter-system-flag.c:71
 msgid "Read"
 msgstr "Gelezen"
 
-# filter/filter-editor.c:198

+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filters Bewerken"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
-# mail/mail-config.c:1490

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

+# calendar/gui/calendar-commands.c:56
 #: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Uitgaand"
 
-# mail/folder-browser-factory.c:89

-#: filter/filter.glade.h:10
+# mail/folder-browser-factory.c:89
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
-# mail/mail-config.c:1199

+# shell/e-storage.c:424
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "De opgegeven folder was niet gevonden"
+
+# mail/mail-config.c:1199
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "VMap Bronnen"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Beantwoord"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+# shell/e-shell-view-menu.c:404
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Registreren lokale map"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Geef Score"
 
-# shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:16
+# composer/e-msg-composer-attachment-bar.c:299
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Bijvoegsel"
+
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+# shell/e-shell-view-menu.c:402
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopie�r naar Map"
 
-# mail/message-list.c:509

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

-#: filter/libfilter-i18n.h:18
+# mail/message-list.c:502
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzend datum"
 
-# 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

-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Verwijderd"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "bevat niet"
 
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Klad"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+# composer/e-msg-composer.c:676
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "begint niet met"
+
+# composer/e-msg-composer.c:676
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "bestaat niet"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "eindigt op"
+
+# calendar/gui/gncal-todo.c:488
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Stoppen"
+
+# calendar/gui/getdate.y:441
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "bestaat"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:33
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Gevlagd"
-
-# mail/folder-browser-factory.c:37

-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+# mail/folder-browser-factory.c:37
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Doorsturen naar Adres"
 
-#: filter/libfilter-i18n.h:31
+# addressbook/gui/component/alphabet.glade.h:17
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "is"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "is grote dan"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "is niet"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Mailing lijst"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Bericht"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Bericht Kop"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+# composer/e-msg-composer-address-dialog.glade.h:7
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Bericht ontvangen"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Bericht verzonden"
 
-# shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+# shell/e-shell-view-menu.c:402
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "op of na"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "op of voor"
+
+# composer/e-msg-composer-address-dialog.glade.h:7
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Geaddresseerden"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Gelezen"
-
-# calendar/gui/print.c:326

-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+# calendar/gui/print.c:326
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Stel Vlag in"
-
-# mail/message-list.c:460

-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+# mail/message-list.c:460
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Stel Status in"
 
-# mail/mail-config.c:1490

-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "klinkt als"
+
+# mail/mail-config.c:1490
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Bron"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "begint met"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-# mail/message-list.c:495

-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+# mail/message-list.c:495
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Onderwerp"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-# composer/e-msg-composer.c:676

-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "eindigt op"
-
-# calendar/gui/getdate.y:441

-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "bestaat"
-
-# addressbook/gui/component/alphabet.glade.h:17

-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "is grote dan"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "is gelijk aan reguliere expressie"
-
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "op of na"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "op of voor"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "begint met"
-
-# filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "was na"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "was voor"
 
-# mail/mail-config.c:1490

-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Regel Toevoegen"
-
-# mail/mail-config.c:1488

-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+# mail/mail-config.c:1488
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Bewerk Score Regel"
 
-# filter/filter-editor.c:198

-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VMap Regel Toevoegen"
-
-# filter/filter-editor.c:198

-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Bewerk VMap Regel"
-
-#. add the vTrash folder
-#: mail/component-factory.c:219 mail/component-factory.c:447
-msgid "vTrash"
-msgstr "vPrullenbak"
-
-# mail/component-factory.c:196

-#: mail/component-factory.c:302
+# mail/component-factory.c:196
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het post gedeelte van Evolution niet initialiseren."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Sla op als vFolder"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Bericht of onderwerp bevat"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Bericht bevat"
-
-# mail/message-list.c:495

-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Onderwerp bevat"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Bericht bevat niet"
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Onderwerp bevat niet"
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Eigenschappen"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Afzender bevat"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr "Sla op als vFolder"
 
-#: mail/folder-browser.c:667
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:670 mail/folder-browser.c:788
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "VFolder op Mailing Lijst"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:673
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:675 mail/folder-browser.c:787
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:681 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Openen"
-
-# composer/e-msg-composer.c:463

-#: mail/folder-browser.c:683
+# composer/e-msg-composer.c:463
+#: mail/folder-browser.c:544
 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:684 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+# 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:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Afdrukken"
 
-# mail/folder-browser-factory.c:35

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

-#: mail/folder-browser.c:687 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+# mail/folder-browser-factory.c:35
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
-# mail/folder-browser-factory.c:37

-#: mail/folder-browser.c:688 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+# mail/folder-browser-factory.c:37
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Doorsturen"
 
-# calendar/gui/calendar-commands.c:554

-#: mail/folder-browser.c:689 ui/evolution-mail.xml.h:13
+# calendar/gui/calendar-commands.c:554
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Ingebonden doorsturen"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:560
 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:692
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
-# shell/e-shell-view-menu.c:402

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

-#: mail/folder-browser.c:695
+# shell/e-shell-view-menu.c:402
+#: mail/folder-browser.c:569
 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:697
+# 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:573
 msgid "Undelete"
 msgstr "Terughalen"
 
-# addressbook/contact-editor/e-contact-editor.c:745

-# 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:701
+# addressbook/contact-editor/e-contact-editor.c:745
+# 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:583
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-#: mail/folder-browser.c:790
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailing Lijst (%s)"
 
-#: mail/folder-browser.c:791
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder op Mailing Lijst (%s)"
@@ -5813,22 +5994,22 @@ msgstr "VFolder op Mailing Lijst (%s)"
 msgid "Evolution component for handling mail."
 msgstr "Evolution component voor het afhandelen van mail"
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Evolution bericht opsteller."
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr "Evolution post uitvoer samenvattings component."
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Evolution post map weergave component."
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Evolution post map factory component."
@@ -5845,34 +6026,17 @@ msgstr "Fabriek voor het Evolution post component."
 msgid "Factory for the Mail Summary component."
 msgstr "Fabriek voor het Post Samenvattings component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importeert mbox bestanden naar Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Huidig opslagformaat:"
 
-# calendar/gui/event-editor.c:294

+# calendar/gui/event-editor.c:294
 #: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Mailbox Formaat"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:10

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

+# addressbook/contact-editor/e-contact-editor-strings.h:10
+# addressbook/contact-editor/e-contact-editor-strings.h:12
 #: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nieuw opslagformaat:"
@@ -5887,7 +6051,7 @@ msgstr ""
 "zoals te weinig diskruimte, wellicht niet automatisch herstelbaar zijn.\n"
 "Wees voorzichtig met het gebruiken van deze optie."
 
-# addressbook/contact-editor/e-contact-editor.c:1341

+# addressbook/contact-editor/e-contact-editor.c:1341
 #: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
@@ -5896,33 +6060,33 @@ msgstr "maildir"
 msgid "mbox"
 msgstr "mbox"
 
-# addressbook/gui/component/alphabet.glade.h:16

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

+# addressbook/gui/component/alphabet.glade.h:16
+# calendar/cal-util/timeutil.c:98
 #: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-# shell/e-shell-view.c:596

-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Geen"
-
-# calendar/gui/prop.c:836

+# calendar/gui/prop.c:836
 #: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (standaard)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "Weet je zeker dat je deze taak zonder naam wilt verwijderen?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "Weet je zeker dat je deze afspraak zonder naam wilt verwijderen?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:389
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr "Evolution Account Beheer"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5930,36 +6094,46 @@ msgstr ""
 "Een of meer servers zijn niet correct geconfigureerd.\n"
 "Wil je toch opslaan?"
 
-# shell/e-shell-view-menu.c:369

+# shell/e-shell-view-menu.c:369
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Bewerker"
 
-# mail/mail-config.c:1199

+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Ongedefini�erd"
+
+# mail/mail-config.c:1199
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
-# mail/message-list.c:495

+# mail/message-list.c:495
 #: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-# mail/mail-ops.c:374

+# mail/mail-ops.c:374
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing lijst"
 
-#: mail/mail-callbacks.c:83
+# mail/mail-config.c:1490
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Filter Regel Toevoegen"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5971,7 +6145,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil je nu het programma configureren?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5979,7 +6153,7 @@ msgstr ""
 "Je moet een identiteit configuren\n"
 "voordat je post kunt versturen."
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5987,12 +6161,12 @@ msgstr ""
 "Je moet een post transport configuren\n"
 "voordat je een e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post transport methode ingesteld"
 
-# mail/mail-ops.c:386

-#: mail/mail-callbacks.c:223
+# mail/mail-ops.c:386
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6000,36 +6174,36 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr "Je moet een account configureren voordat je deze e-mail kan versturen."
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:571
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
 
-# mail/folder-browser-factory.c:37

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

-#: mail/mail-callbacks.c:812
+# mail/folder-browser-factory.c:41
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-# composer/e-msg-composer.c:1127

-#: mail/mail-callbacks.c:814
+# composer/e-msg-composer.c:1127
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopi�er bericht(en) naar"
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6037,12 +6211,12 @@ msgstr ""
 "Je mag alleen berichten bewerken die opgeslagen zijn\n"
 "in de Klad map."
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-# shell/e-storage.c:416

-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+# shell/e-storage.c:416
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6050,16 +6224,16 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-# composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:1140
+# composer/e-msg-composer.c:494
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6068,21 +6242,21 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
 #: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Account"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: mail/mail-config.glade.h:2
 msgid "Account Information"
 msgstr "Account Informatie"
@@ -6091,36 +6265,31 @@ msgstr "Account Informatie"
 msgid "Account Management"
 msgstr "Account Beheer"
 
-# composer/e-msg-composer-attachment.glade.h:7

-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Account Eigenschappen"
-
-# calendar/gui/gncal-todo.c:479

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

-#: mail/mail-config.glade.h:6
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-# mail/mail-config.c:739 mail/mail-config.c:819

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

-#: mail/mail-config.glade.h:8
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Authenticatie Type:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automatisch controleren op nieuwe post elke"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Test instellingen"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6136,221 +6305,218 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om je instellingen op te slaan."
 
+# calendar/gui/prop.c:836
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-# calendar/gui/prop.c:836

-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "Standaard"
 
-# shell/e-shell-view.c:596

-#: mail/mail-config.glade.h:22
+# shell/e-shell-view.c:596
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Klaar"
 
-# mail/mail-config.c:305

+# mail/mail-config.c:305
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-Mail Adres:"
-
-# mail/mail-config.c:305

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

-#: mail/mail-config.glade.h:26
+# mail/mail-config.c:305
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "E-mail adres:"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Evolution Post Configuratie"
 
-# mail/mail-config.c:277

-#: mail/mail-config.glade.h:27
+# mail/mail-config.c:277
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Volledige Naam:"
 
-# mail/mail-config.c:725

-#: mail/mail-config.glade.h:30
+# mail/mail-config.c:725
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Computernaam:"
 
-# mail/mail-config.c:1180

+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
+# mail/mail-config.c:1180
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identiteit"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Opnemen in \"Get Mail\" bewerkingen."
+msgid "Include this account when receiving mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Inkomende E-Mail Server"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Houdt e-mails op de server"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "Post"
 
-# addressbook/contact-editor/e-contact-editor.c:808

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

-#: mail/mail-config.glade.h:37
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Post Account"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:38
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Post Configuratie"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:39
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Post Configuratie Druide"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Stel dit in als standaard account"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Markeer berichten als \"Gelezen\" na: "
 
+# shell/e-shell-view-menu.c:398
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "Andere"
-
-# shell/e-shell-view-menu.c:398

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

-#: mail/mail-config.glade.h:46
+# addressbook/printing/e-contact-print.glade.h:10
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Optioneel"
 
-# mail/mail-config.c:328

-#: mail/mail-config.glade.h:47
+# mail/mail-config.c:328
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Uitgaande E-Mail Server"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "PGP binary path:"
 msgstr "Locatie van PGP:"
 
-# mail/folder-browser-factory.c:101

-#: mail/mail-config.glade.h:51
+# mail/folder-browser-factory.c:101
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Platte Tekst"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Bezig met ontvangen E-mail"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Onthoud mijn wachtwoord"
 
-# mail/folder-browser-factory.c:34

-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Antwoord-Naar:"
+# mail/mail-config.c:305
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "E-mail adres:"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#: mail/mail-config.glade.h:57
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Benodigd"
 
-# addressbook/gui/component/addressbook.c:943

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

-#: mail/mail-config.glade.h:59
+# addressbook/gui/component/addressbook.c:943
+# addressbook/gui/minicard/e-minicard.c:330
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "Selecteer lokatie PGP"
 
-# mail/mail-config.c:340

-#: mail/mail-config.glade.h:61
+# mail/mail-config.c:340
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Selecteer signatuur bestand"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "Stuur post standaard in HTML formaat."
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: mail/mail-config.glade.h:63
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Bezig met versturen E-mail"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: mail/mail-config.glade.h:65
+# mail/mail-config.c:1163 mail/mail-config.c:1242
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Server Configuratie"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config.glade.h:66
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Server Type: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Server vereist authenticatie"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Servers"
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Server Type: "
 
-# mail/mail-config.c:340

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

-#: mail/mail-config.glade.h:70
+# mail/mail-config.c:340
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Signatuur:"
 
-# mail/mail-config.c:1490

-#: mail/mail-config.glade.h:72
+# mail/mail-config.c:1490
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Deze server heeft een beveiligde verbinding (SSL) nodig"
 
-# mail/mail-config.c:1220

-#: mail/mail-config.glade.h:74
+# mail/mail-config.c:1220
+#: mail/mail-config.glade.h:71
 msgid "Transport"
 msgstr "Transport"
 
-# addressbook/printing/e-contact-print.glade.h:30

-#: mail/mail-config.glade.h:75
+# mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Authenticatie"
+
+# addressbook/printing/e-contact-print.glade.h:30
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Type"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -6358,17 +6524,17 @@ msgstr ""
 "Type de naam waarmee je wilt referen naar deze servers. Bijvoorbeeld: "
 "\"Thuis\" of \"Werk\"."
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#: mail/mail-config.glade.h:78
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Gebruikers Informatie"
 
-# mail/mail-config.c:725

-#: mail/mail-config.glade.h:79
+# mail/mail-config.c:725
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6378,12 +6544,19 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-# calendar/gui/getdate.y:426

+# calendar/gui/gncal-todo.c:488
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "B_ewerken..."
+
+# calendar/gui/getdate.y:426
 #: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "minuten."
 
-#: mail/mail-config-druid.c:401
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -6392,13 +6565,13 @@ msgstr ""
 "Fout bij het verifi�ren van de inkomende post configuratie.\n"
 "Je zou problemen kunnen ondervinden tijdens het ophalen van je post van %s"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

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

-#: mail/mail-config-druid.c:495
+# addressbook/gui/component/ldap-server-dialog.glade.h:11
+# composer/e-msg-composer-address-dialog.glade.h:8
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Benoemingsruimte:"
 
-#: mail/mail-config-druid.c:683
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -6408,12 +6581,12 @@ msgstr ""
 "Je zou problemen kunnen ondervinden tijdens het versturen van je post via %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1042
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution Account Wizard"
 
-# addressbook/contact-editor/e-contact-editor.c:671

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

+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
 #: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
@@ -6423,7 +6596,7 @@ msgstr "Aanhangsel Opslaan"
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
-# composer/e-msg-composer.c:463

+# composer/e-msg-composer.c:463
 #: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
@@ -6446,109 +6619,114 @@ msgstr "Extern Weergave Programma"
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-# addressbook/printing/e-contact-print.glade.h:52

+# addressbook/printing/e-contact-print.glade.h:52
 #: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Verbergen"
 
-# composer/e-msg-composer-attachment-bar.c:299

+# composer/e-msg-composer-attachment-bar.c:299
 #: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijvoegsel"
 
-# addressbook/contact-editor/e-contact-editor.c:782

-#: mail/mail-format.c:654
+# addressbook/contact-editor/e-contact-editor.c:782
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Bezig met laden bericht inhoud"
 
-# calendar/gui/prop.c:519

-#: mail/mail-format.c:943
+# calendar/gui/prop.c:519
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
-# composer/e-msg-composer.c:894

-#: mail/mail-format.c:949
+# composer/e-msg-composer.c:894
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal gesigneerd en is authentiek."
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal gesigneerd, maar er kan niet worden bewezen dat het "
 "authentiek is."
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, 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:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-local.c:454
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Map `%s' bestaat niet."
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "Bezig met openen '%s'"
 
-#: mail/mail-local.c:727
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:731
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Herconfigureer map"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:784
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:816
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Naam oude map gewijzigd en map geopend"
 
-# shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:834
+# shell/e-shell-view-menu.c:404
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
-# composer/e-msg-composer.c:1127

-#: mail/mail-local.c:848
+# composer/e-msg-composer.c:1127
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Bezig met het kopi�ren van berichten"
 
-#: mail/mail-local.c:869
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6557,7 +6735,7 @@ msgstr ""
 "Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6565,7 +6743,7 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "allicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-mt.c:137
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6574,7 +6752,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:139
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6583,101 +6761,105 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-# calendar/gui/gnome-month-item.c:737

-#: mail/mail-mt.c:438 mail/mail-mt.c:467 mail/mail-mt.c:725
+# calendar/gui/gnome-month-item.c:737
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Bezig"
 
-# shell/e-shell-view-menu.c:159

-#: mail/mail-mt.c:707
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+# shell/e-shell-view-menu.c:159
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Evolution voortgang"
 
-#: mail/mail-ops.c:519
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:518
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht naar map"
 
-#: mail/mail-ops.c:820
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-# composer/e-msg-composer.c:1127

-#: mail/mail-ops.c:820
+# composer/e-msg-composer.c:1127
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-# calendar/gui/gnome-month-item.c:737

-#: mail/mail-ops.c:837
+# calendar/gui/gnome-month-item.c:737
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:840
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Bezig met kopi�ren"
 
-#: mail/mail-ops.c:851
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s bericht %d van %d (uid \"%s\")"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1036
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1077 mail/mail-ops.c:1215
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1144
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1331
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1380
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1447
+# mail/folder-browser-factory.c:37
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Bezig met ophalen berichten"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
 
-# composer/e-msg-composer.c:1127

-#: mail/mail-ops.c:1531
+# composer/e-msg-composer.c:1127
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Bezig met het opslaan van berichten"
 
-#: mail/mail-ops.c:1610
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6686,13 +6868,13 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1672
 #, 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:1637
+# composer/e-msg-composer.c:474
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6701,13 +6883,13 @@ msgstr ""
 "Fout bij opslaan berichten naar: %s:\n"
 " %s"
 
-# addressbook/contact-editor/e-contact-editor.c:671

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

-#: mail/mail-ops.c:1711
+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijvoegsel"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6716,148 +6898,153 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-# mail/mail-threads.c:814

-#: mail/mail-ops.c:1754
+# mail/mail-threads.c:814
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

+# composer/e-msg-composer-address-dialog.glade.h:9
 #: mail/mail-search-dialogue.c:107
 msgid "_Search"
 msgstr "_Zoeken"
 
-# filter/filter-editor.c:212

-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr "Bezig met annuleren ..."
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr "Verstuur & Ontvang e-mail"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr "Bezig met ontvangen"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr "Bezig met Updaten ..."
 
-#: mail/mail-send-recv.c:270 mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr "Bezig met wachten ..."
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-# filter/filter-editor.c:212

-#: mail/mail-send-recv.c:484
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "Klaar."
 
-# mail/mail-threads.c:621

+# mail/mail-threads.c:621
 #: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
-#: mail/mail-tools.c:197
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
-# mail/folder-browser-factory.c:37

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

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

-#: mail/mail-tools.c:284
+# mail/folder-browser-factory.c:37
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:366
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Kan locatie `%s' niet openen:\n"
-"%s"
 
-# shell/e-shell-view.c:208

-#: mail/mail-vfolder.c:170
+# shell/e-shell-view.c:208
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:321
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-# mail/folder-browser-factory.c:34

+# 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:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Beantwoorden"
 
-# mail/folder-browser-factory.c:34

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

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

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

-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+# mail/folder-browser-factory.c:43
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 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:7
+# mail/folder-browser-factory.c:45
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Verwijdert dit bericht"
 
-# calendar/gui/getdate.y:448

+# calendar/gui/getdate.y:448
 #: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Ongelezen"
 
-# mail/folder-browser-factory.c:37

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Gelezen"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Beantwoord"
+
+# mail/folder-browser-factory.c:37
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-# composer/e-msg-composer.c:894

+# composer/e-msg-composer.c:894
 #: mail/message-list.c:630
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-# calendar/gui/calendar-commands.c:746

+# calendar/gui/calendar-commands.c:746
 #: mail/message-list.c:952
 #, c-format
 msgid "[ %s ]"
@@ -6869,12 +7056,12 @@ msgstr "[ %s ]"
 msgid "%s, et al."
 msgstr "%s, en dergelijke."
 
-# shell/e-storage.c:434

+# shell/e-storage.c:434
 #: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

+# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
 #: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
@@ -6895,78 +7082,82 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-# calendar/gui/event-editor.c:1745

+# calendar/gui/event-editor.c:1745
 #: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-# mail/message-list.c:488

+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Gevlagd"
+
+# mail/message-list.c:488
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Van"
 
-# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

+# calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
 #: mail/message-list.c:1172
 msgid "Date"
 msgstr "Datum"
 
-# mail/message-list.c:509

+# mail/message-list.c:509
 #: mail/message-list.c:1172
 msgid "Received"
 msgstr "Ontvangen"
 
-# mail/message-list.c:516

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

+# mail/message-list.c:523
 #: mail/message-list.c:1173
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/openpgp-utils.c:84
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Voer je %s passphrase voor %s in"
 
-#: mail/openpgp-utils.c:87
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Voer je %s passphrase in."
 
-# calendar/gui/event-editor.c:294

-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
+# calendar/gui/event-editor.c:294
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
-#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr "Geen ontvangers gespecifieerd"
 
-#: mail/openpgp-utils.c:1067
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kon tijdelijk bestand niet maken: %s"
 
-# shell/e-shell-view.c:208

+# shell/e-shell-view.c:208
 #: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Map"
 
-# calendar/gui/print.c:326

+# calendar/gui/print.c:326
 #: mail/subscribe-dialog.c:65
 msgid "Store"
 msgstr "Opslag"
@@ -6990,17 +7181,17 @@ msgstr "Bezig met aanmelden bij map \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
-# composer/e-msg-composer-attachment.glade.h:10

+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Map naam:"
 
-# shell/e-shell-view.c:208

+# shell/e-shell-view.c:208
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Map type:"
 
-# shell/e-storage.c:422

+# shell/e-storage.c:422
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
@@ -7036,7 +7227,7 @@ msgstr ""
 "Er is geen importeerder die het volgende kan afhandelen\n"
 "%s"
 
-# calendar/gui/gnome-month-item.c:737

+# calendar/gui/gnome-month-item.c:737
 #: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "Bezig met importeren"
@@ -7050,7 +7241,7 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-# composer/e-msg-composer.c:494

+# composer/e-msg-composer.c:494
 #: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
@@ -7065,27 +7256,27 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:508

+# widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "Automatisch"
 
-# composer/e-msg-composer-attachment.glade.h:10

+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-# mail/mail-config.c:340

+# mail/mail-config.c:340
 #: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-# composer/e-msg-composer-attachment.glade.h:10

+# composer/e-msg-composer-attachment.glade.h:10
 #: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "Bestandstype:"
 
-# widgets/e-table/e-table-config.glade.h:9

+# widgets/e-table/e-table-config.glade.h:9
 #: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "Importeer"
@@ -7110,12 +7301,12 @@ msgstr ""
 "Klik op \"Importeren\" om te beginnen met het importeren van het bestand "
 "naar Evolution."
 
-# shell/e-shell-view-menu.c:369

+# shell/e-shell-view-menu.c:369
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
 msgstr "Evolution Importeer Hulpmiddel"
 
-# shell/e-shell-view-menu.c:369

+# shell/e-shell-view-menu.c:369
 #: shell/importer/import.glade.h:3
 msgid "Evolution Importer Utility"
 msgstr "Evolution Importeer Hulpmiddel"
@@ -7130,7 +7321,7 @@ msgstr ""
 "Deze wizard zal je begeleiden door het proces van het importeren\n"
 "van externe bestanden naar Evolution."
 
-# shell/e-setup.c:47

+# shell/e-setup.c:47
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installatie"
@@ -7143,34 +7334,34 @@ msgstr ""
 "Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
 "in je persoonlijke Evolutie directory"
 
-# shell/e-setup.c:52

+# shell/e-setup.c:52
 #: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
-# mail/mail-threads.c:814

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

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

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

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

+# shell/e-setup.c:69
 #: shell/e-setup.c:209
 #, c-format
 msgid ""
@@ -7182,7 +7373,7 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-# shell/e-setup.c:84

+# shell/e-setup.c:84
 #: shell/e-setup.c:224
 #, c-format
 msgid ""
@@ -7192,7 +7383,7 @@ msgstr ""
 "Kan de bestanden niet kopieren naar\n"
 "`%s'."
 
-# shell/e-setup.c:108

+# shell/e-setup.c:108
 #: shell/e-setup.c:249
 #, c-format
 msgid ""
@@ -7204,7 +7395,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-# shell/e-setup.c:108

+# shell/e-setup.c:108
 #: shell/e-setup.c:261
 #, c-format
 msgid ""
@@ -7216,7 +7407,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-# shell/e-shell-folder-creation-dialog.c:81

+# shell/e-shell-folder-creation-dialog.c:81
 #: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
@@ -7226,17 +7417,17 @@ msgstr ""
 "Kan de gespecificeerde folder niet aanmaken:\n"
 "%s"
 
-# shell/e-shell-folder-creation-dialog.c:133

+# shell/e-shell-folder-creation-dialog.c:133
 #: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven folder-naam is niet geldig."
 
-# shell/e-shell-folder-creation-dialog.c:223

+# shell/e-shell-folder-creation-dialog.c:223
 #: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe folder maken"
 
-# shell/e-shell-folder-selection-dialog.c:95

+# shell/e-shell-folder-selection-dialog.c:95
 #: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
@@ -7245,32 +7436,32 @@ msgstr ""
 "Het type van de geselecteerde folder is niet geldig\n"
 "voor de opdracht."
 
-# shell/e-shell-folder-selection-dialog.c:236

+# shell/e-shell-folder-selection-dialog.c:236
 #: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nieuw..."
 
-# shell/e-shell-folder-title-bar.c:355

+# shell/e-shell-folder-title-bar.c:355
 #: 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:110
 #: shell/e-shell-view-menu.c:159
 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:116
 #: shell/e-shell-view-menu.c:165
 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:161
 #: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-# shell/e-shell-view-menu.c:163

+# shell/e-shell-view-menu.c:163
 #: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
@@ -7281,40 +7472,40 @@ msgstr ""
 "programma's voor post, planning en kontakt beheer\n"
 "in de GNOME werkomgeving."
 
-# shell/e-shell-view-menu.c:301

+# shell/e-shell-view-menu.c:301
 #: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
-# shell/e-shell-view.c:113

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

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

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

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

+# shell/e-shell.c:299
 #: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7323,12 +7514,12 @@ msgstr ""
 "Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
 "Dit betekent waarschijnlijk dat het %s component is gecrashed"
 
-# addressbook/gui/component/addressbook.c:420

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

+# mail/mail-config.c:277
 #: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Groep:"
@@ -7346,22 +7537,22 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-# shell/e-shortcuts-view.c:235

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

+# shell/e-shortcuts-view.c:236
 #: 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:238
 #: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Grote Iconen"
 
-# shell/e-shortcuts-view.c:239

+# shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote iconen"
@@ -7370,7 +7561,7 @@ msgstr "Toont de snelkoppelingen als grote iconen"
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-# addressbook/gui/component/addressbook.c:420

+# addressbook/gui/component/addressbook.c:420
 #: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
@@ -7379,139 +7570,138 @@ msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 msgid "_Remove This Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-# shell/e-shortcuts-view.c:333

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

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

+# shell/e-shell-view-menu.c:419
 #: shell/e-shortcuts-view.c:290
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-# shell/e-shortcuts-view.c:330

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

+# shell/e-shortcuts-view.c:330
 #: 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:333
 #: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-# shell/e-shortcuts.c:358

+# shell/e-shortcuts.c:358
 #: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
-# shell/e-shell-view-menu.c:398

-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+# shell/e-shell-view-menu.c:398
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "Weerga_ve"
 
-# mail/folder-browser-factory.c:43

-#: shell/e-storage-set-view.c:345
+# mail/folder-browser-factory.c:43
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Geef de geselecteerde map weer"
 
-# shell/e-storage.c:217

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

-#: shell/e-storage.c:427
+# shell/e-storage.c:412
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Geen fout"
 
-# shell/e-storage.c:414

-#: shell/e-storage.c:429
+# shell/e-storage.c:414
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Generieke fout"
 
-# shell/e-storage.c:416

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

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

-#: shell/e-storage.c:435
+# shell/e-storage.c:420
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "I/O fout"
 
-# shell/e-storage.c:422

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

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

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

-#: shell/e-storage.c:443
+# shell/e-storage.c:428
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
-# shell/e-storage.c:430

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

-#: shell/e-storage.c:447
+# shell/e-storage.c:432
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-# shell/main.c:172

+# shell/main.c:172
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "De Evolution schil."
 
-# shell/main.c:99

-#: shell/main.c:74
+# shell/main.c:99
+#: shell/main.c:73
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hallo. Bedankt voor het nemen van de tijd voor het downloaden van deze\n"
 "preview release van de Evolution werkgroep suite.\n"
@@ -7533,8 +7723,8 @@ msgstr ""
 "wachten\n"
 "met smart je bijdrages af!\n"
 
-# shell/main.c:126

-#: shell/main.c:101
+# shell/main.c:126
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7542,297 +7732,314 @@ msgstr ""
 "Bedankt\n"
 "Het Evolution Team\n"
 
-# shell/main.c:172

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

-#: shell/main.c:198
+# shell/main.c:220
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-# shell/e-shell-view-menu.c:404

+# shell/e-shell-view-menu.c:404
 #: ui/evolution-addressbook.xml.h:2
 msgid "Create new contact"
 msgstr "Nieuw contact maken"
 
-# addressbook/gui/component/addressbook.c:426

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

+# addressbook/gui/component/addressbook.c:424
 #: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 msgid "Find"
 msgstr "Vinden"
 
-# addressbook/gui/component/addressbook.c:424

+# addressbook/gui/component/addressbook.c:424
 #: ui/evolution-addressbook.xml.h:6
 msgid "Find a contact"
 msgstr "Zoek een contact"
 
-# addressbook/gui/component/addressbook.c:506

+# addressbook/gui/component/addressbook.c:506
 #: ui/evolution-addressbook.xml.h:7
 msgid "New contact"
 msgstr "Nieuw contact"
 
-# addressbook/gui/component/addressbook.c:425

-#: ui/evolution-addressbook.xml.h:9
+# composer/e-msg-composer.c:894
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Geeft een voorbeeld van het af te drukken bericht"
+
+# addressbook/gui/component/addressbook.c:425
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Stoppen"
 
-# addressbook/printing/e-contact-print.glade.h:26

-#: ui/evolution-addressbook.xml.h:11
+# addressbook/printing/e-contact-print.glade.h:26
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Allen Weergeven"
 
-# addressbook/gui/component/addressbook.c:424

-#: ui/evolution-addressbook.xml.h:13
+# addressbook/gui/component/addressbook.c:424
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Geef alle kontaken weer"
 
-# mail/folder-browser-factory.c:95

-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Adresboek Configuratie..."
+# mail/mail-config.c:1490
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Adresboek Bronnen"
 
-# addressbook/gui/component/addressbook.c:425

-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Druk Kontakten af..."
+# addressbook/contact-editor/e-contact-editor-strings.h:26
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "C_ontacten..."
 
-#: ui/evolution-addressbook.xml.h:16
+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Afdrukken..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_Zoek naar kontakten"
 
-# addressbook/contact-editor/e-contact-editor.c:807

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

-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+# 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:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-# calendar/gui/calendar-commands.c:525

+# calendar/gui/calendar-commands.c:525
 #: ui/evolution-calendar.xml.h:1
 msgid "5 Days"
 msgstr "5 Dagen"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
 msgid "Alter preferences"
 msgstr "Instellingen Wijzigen"
 
-# calendar/gui/calendar-commands.c:659

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

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

-#: ui/evolution-calendar.xml.h:6
+# calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-# calendar/gui/calendar-commands.c:660

-#: ui/evolution-calendar.xml.h:7
+# calendar/gui/calendar-commands.c:660
+#: ui/evolution-calendar.xml.h:5
 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:8
+# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
+# calendar/gui/gncal-todo.c:717
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Dag"
 
-# calendar/gui/calendar-commands.c:552

-#: ui/evolution-calendar.xml.h:9
+# calendar/gui/calendar-commands.c:558
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Ga naar"
+
+# calendar/gui/calendar-commands.c:552
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Ga terug in tijd"
 
-# calendar/gui/calendar-commands.c:554

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

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

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

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

-#: ui/evolution-calendar.xml.h:14
+# calendar/gui/calendar-commands.c:531
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Maand"
 
-# 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

-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+# 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
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
 msgstr "Nieuwe afspraak"
 
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Volgende"
 
-# calendar/gui/calendar-commands.c:663

-#: ui/evolution-calendar.xml.h:18
+# calendar/gui/calendar-commands.c:663
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Open Kalender"
 
-# calendar/gui/calendar-commands.c:552

-#: ui/evolution-calendar.xml.h:19
+# calendar/gui/calendar-commands.c:552
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Vorige"
 
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

+# calendar/gui/print.c:1084
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Druk Kalender af"
+
+# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Druk deze Kalender af"
 
-# composer/e-msg-composer.c:463

-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+# composer/e-msg-composer.c:463
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Opslaan Als"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: ui/evolution-calendar.xml.h:23
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Kalender bewaren als iets anders"
 
-# calendar/gui/calendar-commands.c:522

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

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

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

-#: ui/evolution-calendar.xml.h:27
+# 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:28 widgets/misc/e-dateedit.c:413
+# calendar/gui/calendar-commands.c:553
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Vandaag"
 
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#: ui/evolution-calendar.xml.h:29
+# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Week"
 
-# shell/e-shell-view-menu.c:398

-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+# calendar/gui/calendar-commands.c:59
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Afspraak"
+
+# shell/e-shell-view-menu.c:398
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Nieuw"
 
-# calendar/gui/calendar-commands.c:663

-#: ui/evolution-calendar.xml.h:31
+# calendar/gui/calendar-commands.c:663
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "Open Ka_lender"
 
-# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Druk deze kalender af"
-
-# composer/e-msg-composer.c:463

-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+# composer/e-msg-composer.c:463
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 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

+# 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:2
 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

+# 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:3
 msgid "Delete..."
 msgstr "Verwijderen..."
 
-# addressbook/contact-editor/e-contact-editor-strings.h:20

+# addressbook/contact-editor/e-contact-editor-strings.h:20
 #: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Help"
 
-# addressbook/contact-editor/e-contact-editor.c:844

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

+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
-# addressbook/contact-editor/e-contact-editor.c:845

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

+# addressbook/contact-editor/e-contact-editor.c:845
+# calendar/gui/event-editor.c:1326
 #: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
 #: ui/evolution-task-editor-dialog.xml.h:40
 msgid "Print this item"
 msgstr "Item afdrukken"
 
-# addressbook/contact-editor/e-contact-editor.c:844

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

+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Afdrukken..."
 
-# composer/e-msg-composer.c:463

+# composer/e-msg-composer.c:463
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
 #: ui/evolution-message-composer.xml.h:16
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
-# addressbook/contact-editor/e-contact-editor.c:839

+# addressbook/contact-editor/e-contact-editor.c:839
 #: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:52
 msgid "Save and Close"
 msgstr "Opslaan en Sluiten"
 
-# addressbook/contact-editor/e-contact-editor.c:840

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

+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
@@ -7841,33 +8048,27 @@ msgstr "Bewaar dit kontakt en sluit het dialoogvenster"
 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

+# addressbook/contact-editor/e-contact-editor.c:863
+# calendar/gui/event-editor.c:1344
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr "Zie help"
 
-# addressbook/contact-editor/e-contact-editor.c:782

+# addressbook/contact-editor/e-contact-editor.c:782
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Nieuw _bericht naar contact..."
 
-# widgets/e-table/e-table-config.glade.h:10

+# widgets/e-table/e-table-config.glade.h:10
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Bestand"
 
-# addressbook/contact-editor/e-contact-editor.c:844

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

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

+# calendar/gui/print.c:326
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Opslaan"
@@ -7876,40 +8077,40 @@ msgstr "_Opslaan"
 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

+# 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:2 ui/evolution-task-editor-dialog.xml.h:2
 msgid "About..."
 msgstr "Over..."
 
-# shell/e-shell-view-menu.c:474

+# shell/e-shell-view-menu.c:474
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-# calendar/gui/event-editor.c:1251

+# calendar/gui/event-editor.c:1251
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 msgid "Address _Book... (FIXME)"
 msgstr "Adres _Boek... (FIXME)"
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/calendar-commands.c:659
 #: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 msgid "C_lear"
 msgstr "W_issen"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 msgid "C_ut"
 msgstr "K_nippen"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 msgid "Chec_k Names (FIXME)"
 msgstr "Contro_leer Namen (FIXME)"
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/calendar-commands.c:659
 #: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
 msgid "Clear"
 msgstr "Wissen"
@@ -7918,18 +8119,18 @@ msgstr "Wissen"
 msgid "Clear the selection"
 msgstr "Selectie wissen"
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #: ui/evolution-event-editor.xml.h:11
 msgid "Close this appointment"
 msgstr "Deze afspraak sluiten"
 
-# shell/e-shell-view-menu.c:402

+# shell/e-shell-view-menu.c:402
 #: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopi�er naar Map... (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopi�ren"
@@ -7938,7 +8139,7 @@ msgstr "Kopi�ren"
 msgid "Copy the selection"
 msgstr "Kopi�er de selectie"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 msgid "Cut"
 msgstr "Knippen"
@@ -7947,6 +8148,11 @@ msgstr "Knippen"
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Verwijdert deze afspraak"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "XML Dumpen"
@@ -7955,116 +8161,107 @@ msgstr "XML Dumpen"
 msgid "Dump the UI Xml description"
 msgstr "Dump de UI Xml omschrijving"
 
-# addressbook/contact-editor/e-contact-editor.c:715

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

+# addressbook/contact-editor/e-contact-editor.c:715
+# calendar/gui/event-editor.c:1190
 #: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 msgid "Fi_rst Item in Folder (FIXME)"
 msgstr "Ee_rste Item in Folder (FIXME)"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 msgid "For_ward (FIXME)"
 msgstr "_Doorsturen (FIXME)"
 
-# calendar/gui/event-editor.c:1265

+# calendar/gui/event-editor.c:1265
 #: ui/evolution-event-editor.xml.h:23
 msgid "Forward as v_Calendar (FIXME)"
 msgstr "Doorsturen als v_Calendar (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:860

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

+# addressbook/contact-editor/e-contact-editor.c:860
+# calendar/gui/event-editor.c:1342
 #: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 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

+# addressbook/contact-editor/e-contact-editor.c:857
+# calendar/gui/event-editor.c:1340
 #: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 msgid "Go to the previous item"
 msgstr "Ga naar het vorige item"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
 msgid "In_complete Task (FIXME)"
 msgstr "On_afgemaakte Taak (FIXME)"
 
-# calendar/gui/prop.c:678

+# calendar/gui/prop.c:678
 #: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 msgid "Modify the file's properties"
 msgstr "De bestandseigenschappen wijzigen"
 
-# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

+# calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
 #: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
 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

+# 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:30 ui/evolution-task-editor-dialog.xml.h:33
 msgid "Paste"
 msgstr "Plakken"
 
-# composer/e-msg-composer-address-dialog.c:192

-# composer/e-msg-composer-address-dialog.c:200

+# composer/e-msg-composer-address-dialog.c:192
+# composer/e-msg-composer-address-dialog.c:200
 #: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-# addressbook/contact-editor/e-contact-editor.c:737

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

+# addressbook/contact-editor/e-contact-editor.c:737
+# calendar/gui/event-editor.c:1212
 #: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "_Vorige"
 
-# addressbook/contact-editor/e-contact-editor.c:737

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

+# addressbook/contact-editor/e-contact-editor.c:737
+# calendar/gui/event-editor.c:1212
 #: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Vorige"
 
-# calendar/gui/print.c:1249

+# calendar/gui/print.c:1249
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Afdruk_voorbeeld"
 
-# addressbook/contact-editor/e-contact-editor.c:844

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

+# addressbook/contact-editor/e-contact-editor.c:844
+# calendar/gui/calendar-commands.c:673
 #: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
 msgid "Print S_etup..."
 msgstr "Afdruk In_stellingen..."
 
-# addressbook/printing/e-contact-print.glade.h:7

+# addressbook/printing/e-contact-print.glade.h:7
 #: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
 msgid "Print Setup"
 msgstr "Printer Instellingen"
 
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Eigenschappen"
-
-# calendar/gui/print.c:326

+# calendar/gui/print.c:326
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Opslaan"
 
-# addressbook/contact-editor/e-contact-editor.c:840

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

+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-event-editor.xml.h:43
 msgid "Save the appointment and close the dialog box"
 msgstr "Bewaar de afspraak en sluit dit venster"
 
-# calendar/gui/calendar-commands.c:553

+# calendar/gui/calendar-commands.c:553
 #: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Afspraak Plannen"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "_Afspraak Plannen"
@@ -8085,99 +8282,93 @@ msgstr "Selecteer alles"
 msgid "Setup the page settings for your current printer"
 msgstr "Stel de pagina instellingen in voor de huidige printer"
 
-# shell/e-shell-view-menu.c:387

+# shell/e-shell-view-menu.c:387
 #: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
 msgid "Task _Request (FIXME)"
 msgstr "Taak Ve_rzoek (FIXME)"
 
-# shell/e-shell-view-menu.c:159

-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+# shell/e-shell-view-menu.c:159
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Over..."
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+# calendar/gui/dialogs/alarm-notify.glade.h:7
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Sluiten"
 
-# shell/e-shell-view-menu.c:381

+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

+# composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
 #: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 msgid "_Copy"
 msgstr "_Kopi�ren"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Debug"
 
-# calendar/gui/gncal-todo.c:488

-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "B_ewerken..."
-
-# addressbook/contact-editor/e-contact-editor-strings.h:20

-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+# addressbook/contact-editor/e-contact-editor-strings.h:20
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Help"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
 msgid "_Item (FIXME)"
 msgstr "_Item (FIXME)"
 
-# shell/e-shell-view-menu.c:381

+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
 msgid "_Journal Entry (FIXME)"
 msgstr "_Dagboek Entry (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:722

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

+# addressbook/contact-editor/e-contact-editor.c:722
+# calendar/gui/event-editor.c:1197
 #: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
 msgid "_Last Item in Folder (FIXME)"
 msgstr "_Laatste Item in Folder (FIXME)"
 
-# shell/e-shell-view-menu.c:375

+# shell/e-shell-view-menu.c:375
 #: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
 msgid "_Mail Message (FIXME)"
 msgstr "_Bericht Versturen (FIXME)"
 
-# shell/e-shell-view-menu.c:402

+# shell/e-shell-view-menu.c:402
 #: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
 msgid "_Move to Folder... (FIXME)"
 msgstr "_Verplaatsen naar Map... (FIXME)"
 
-# shell/e-shell-view-menu.c:381

+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
 msgid "_Note (FIXME)"
 msgstr "_Notitie (FIXME)"
 
-# composer/e-msg-composer-address-dialog.c:191

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

+# 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:68 ui/evolution-task-editor-dialog.xml.h:81
 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

+# 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:69 ui/evolution-task-editor-dialog.xml.h:82
 #: ui/evolution-tasks.xml.h:7
 msgid "_Print"
 msgstr "_Afdrukken"
 
-# composer/e-msg-composer-address-dialog.glade.h:12

-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+# composer/e-msg-composer-address-dialog.glade.h:12
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -8185,18 +8376,18 @@ msgstr "_Eigenschappen..."
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
 #: ui/evolution.xml.h:40
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
-# shell/e-shell-view-menu.c:381

+# shell/e-shell-view-menu.c:381
 #: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
 msgid "_Unread Item (FIXME)"
 msgstr "_Ongelezen Item (FIXME)"
 
-# mail/mail-config.c:1490

+# mail/mail-config.c:1490
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Dienst Toevoegen"
@@ -8205,7 +8396,7 @@ msgstr "Dienst Toevoegen"
 msgid "Add a new service to the Executive Summary"
 msgstr "Voeg een nieuwe dienst toe aan de Uitvoer Samenvatting"
 
-# shell/e-shell-view-menu.c:404

+# shell/e-shell-view-menu.c:404
 #: ui/evolution-executive-summary.xml.h:3
 msgid "Create a new email"
 msgstr "Nieuwe e-mail opstellen"
@@ -8214,265 +8405,320 @@ msgstr "Nieuwe e-mail opstellen"
 msgid "Executive Summary Settings..."
 msgstr "Uitvoer Samenvattings Instellingen..."
 
-# mail/folder-browser-factory.c:29

+# mail/folder-browser-factory.c:29
 #: ui/evolution-executive-summary.xml.h:5
 msgid "New Mail"
 msgstr "Nieuwe E-Mail"
 
-# mail/folder-browser-factory.c:30

-#: ui/evolution-mail.xml.h:1
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Opstellen"
 
-# mail/folder-browser-factory.c:30

-#: ui/evolution-mail.xml.h:2
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Stel een nieuw bericht op"
 
-# mail/folder-browser-factory.c:41

-#: ui/evolution-mail.xml.h:4
+# mail/folder-browser-factory.c:41
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kopi�er het bericht naar een nieuwe map"
 
-# filter/filter-editor.c:198

-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Maak Regel"
-
-# shell/e-shell-view-menu.c:365

-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Map"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Maak Regel Van Bericht"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filteren op Afzender"
+msgid "Display all of the message headers"
+msgstr ""
 
+# calendar/gui/calendar-commands.c:58
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filteren op Geadresseerden"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Lege dagen:"
 
-# mail/folder-browser-factory.c:101

 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filter op Afzender"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filter op Geadresseerden"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filter op Onderwerp"
+
+# mail/folder-browser-factory.c:101
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
-# mail/folder-browser-factory.c:29

-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Post Ophalen"
-
-# mail/folder-browser-factory.c:43

+# mail/folder-browser-factory.c:37
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Verberg G_eselecteerde Berichten"
-
-# mail/folder-browser-factory.c:45

-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Verberg Verwij_derde Berichten"
+#, fuzzy
+msgid "Forward As"
+msgstr "Doorsturen"
 
-# mail/folder-browser-factory.c:37

+# composer/e-msg-composer-address-dialog.glade.h:9
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Verberg _Gelezen Berichten"
+#, fuzzy
+msgid "Full Headers"
+msgstr "Volledige Zoekactie"
 
-# addressbook/contact-editor/e-contact-editor.c:745

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

+# mail/folder-browser-factory.c:43
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Post _Filters..."
+msgid "Hide S_elected Messages"
+msgstr "Verberg G_eselecteerde Berichten"
 
+# mail/folder-browser-factory.c:45
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Aanmeldingen Beheren..."
+msgid "Hide _Deleted Messages"
+msgstr "Verberg Verwij_derde Berichten"
 
+# mail/folder-browser-factory.c:37
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "_Markeer Als Gelezen"
+msgid "Hide _Read messages"
+msgstr "Verberg _Gelezen Berichten"
 
-# addressbook/contact-editor/e-contact-editor.c:704

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

 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
+#, fuzzy
+msgid "Inline"
+msgstr "Geef Ingebonden Weer"
 
-# calendar/gui/print.c:326

 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Verplaatsen"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Aanmeldingen Beheren..."
 
-# mail/folder-browser-factory.c:41

 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Sla het bericht op in een bepaalde folder"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Markeer Als Gelezen"
 
-# composer/e-msg-composer.c:894

 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Geeft een voorbeeld van het af te drukken bericht"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Markeer Als Gelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Markeer Als Ongelezen"
 
-# calendar/gui/print.c:1249

+# calendar/gui/prop.c:519
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Afdrukvoorbeeld van bericht..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Maak berichtweergave leeg"
 
+# calendar/gui/print.c:326
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
+msgid "Move"
+msgstr "Verplaatsen"
 
+# mail/folder-browser-factory.c:41
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Bericht afdrukken..."
+msgid "Move message to a new folder"
+msgstr "Sla het bericht op in een bepaalde folder"
 
-# mail/folder-browser-factory.c:35

 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Iedereen Be_antwoorden"
+msgid "Print message to the printer"
+msgstr "Bericht afdrukken naar de printer"
 
-# mail/folder-browser-factory.c:35

-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Af_zender beantwoorden"
+# shell/e-shell-view.c:596
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Opmerkingen"
 
-# mail/mail-config.c:1490

 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+# mail/folder-browser-factory.c:35
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Iedereen Be_antwoorden"
+
+# mail/mail-config.c:1490
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "Br_on"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "_Alles Selecteren"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "Verstuur & Ontvang e-mail"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Geef _Alle Berichten weer"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Allen Weergeven"
 
-# mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:42
+# mail/folder-browser-factory.c:37
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-# mail/mail-config.c:1490

-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "VMap op Onderwerp"
+
+# mail/mail-config.c:1490
+#: ui/evolution-mail.xml.h:54
 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:46
+# mail/folder-browser-factory.c:89
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtuele Map Bewerker..."
+
+# shell/e-shell-view-menu.c:474
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Acties"
+
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configureer Map..."
+# mail/folder-browser-factory.c:30
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Opstellen"
 
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:48
+# shell/e-shell-view-menu.c:402
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-# composer/e-msg-composer.c:894

-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "Bericht _Bewerken"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Maak Regel Van Bericht"
 
-# mail/folder-browser-factory.c:77

-#: ui/evolution-mail.xml.h:51
+# mail/folder-browser-factory.c:77
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Legen"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filteren op Onderwerp"
+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "Post _Filters..."
 
-# mail/folder-browser-factory.c:37

-#: ui/evolution-mail.xml.h:53
+# shell/e-shell-view-menu.c:365
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Map"
+
+# mail/folder-browser-factory.c:37
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
-# mail/folder-browser-factory.c:95

-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Mail Configuratie..."
+# shell/e-shell-view-menu.c:375
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Bericht versturen"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+# addressbook/printing/e-contact-print.glade.h:12
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "Instellingen..."
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Bericht"
 
-# shell/e-shell-view-menu.c:402

-#: ui/evolution-mail.xml.h:57
+# shell/e-shell-view-menu.c:402
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Openen in Nieuw Venster"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Bericht A_fdrukken"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Open de taak"
 
-# composer/e-msg-composer.c:463

-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Bericht Op_slaan als..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "Verstuur & Ontvang e-mail"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 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:62
+# addressbook/contact-editor/e-contact-editor-strings.h:8
+# addressbook/contact-editor/e-contact-editor.c:673
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_VMap op Onderwerp"
-
-# mail/folder-browser-factory.c:89

-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "_Virtuele Map Bewerker..."
-
-# composer/e-msg-composer.c:951

+# composer/e-msg-composer.c:951
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijvoegen"
 
-# calendar/gui/calendar-commands.c:553

+# calendar/gui/calendar-commands.c:553
 #: ui/evolution-message-composer.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
-# composer/e-msg-composer.c:894

+# composer/e-msg-composer.c:894
 #: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
 msgstr "Versleutel dit bericht met PGP"
 
-# addressbook/contact-editor/e-contact-editor.c:806

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

+# addressbook/contact-editor/e-contact-editor.c:806
+# calendar/gui/event-editor.c:1280
 #: ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
 msgstr "_Opmaak"
@@ -8481,17 +8727,17 @@ msgstr "_Opmaak"
 msgid "HTML"
 msgstr "HTML"
 
-# composer/e-msg-composer.c:891

+# composer/e-msg-composer.c:891
 #: ui/evolution-message-composer.xml.h:8
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
-# composer/e-msg-composer.c:891

+# composer/e-msg-composer.c:891
 #: ui/evolution-message-composer.xml.h:9
 msgid "Insert text file..."
 msgstr "Tekst bestand invoegen..."
 
-# composer/e-msg-composer.c:561

+# composer/e-msg-composer.c:561
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Bestand openen"
@@ -8504,42 +8750,39 @@ msgstr "PGP Versleutelen"
 msgid "PGP Sign"
 msgstr "PGP Signeren"
 
-# filter/filter-editor.c:198

 #: ui/evolution-message-composer.xml.h:17
 msgid "Save _Draft"
 msgstr "Kla_d Opslaan"
 
-# composer/e-msg-composer.c:888

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

+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
-# composer/e-msg-composer.c:888

+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:21
 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

+# composer/e-msg-composer.c:888
 #: ui/evolution-message-composer.xml.h:22
 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

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:23
 msgid "Send"
 msgstr "Versturen"
 
-# filter/filter-editor.c:198

 #: ui/evolution-message-composer.xml.h:24
 msgid "Send _Later"
 msgstr "_Later Versturen"
 
-# filter/filter-editor.c:198

 #: ui/evolution-message-composer.xml.h:25
 msgid "Send _later"
 msgstr "_Later versturen"
@@ -8548,32 +8791,32 @@ msgstr "_Later versturen"
 msgid "Send the mail in HTML format"
 msgstr "Stuur de mail in HTML formaat"
 
-# composer/e-msg-composer.c:942

+# composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:27
 msgid "Send the message later"
 msgstr "Dit bericht later versturen"
 
-# composer/e-msg-composer.c:942

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

+# composer/e-msg-composer.c:942
 #: ui/evolution-message-composer.xml.h:29
 msgid "Send this message now"
 msgstr "Dit bericht nu versturen"
 
-# composer/e-msg-composer.c:907

+# composer/e-msg-composer.c:907
 #: ui/evolution-message-composer.xml.h:30
 msgid "Show / hide attachments"
 msgstr "Toon / Verberg bijvoegsels"
 
-# composer/e-msg-composer.c:906

+# composer/e-msg-composer.c:906
 #: ui/evolution-message-composer.xml.h:31
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
-# composer/e-msg-composer.c:906

+# composer/e-msg-composer.c:906
 #: ui/evolution-message-composer.xml.h:32
 msgid "Show attachments"
 msgstr "Bekijk bijvoegsels"
@@ -8582,16 +8825,66 @@ msgstr "Bekijk bijvoegsels"
 msgid "Sign this message with your PGP key"
 msgstr "Signeer dit bericht met je PGP sleutel"
 
-# composer/e-msg-composer.c:891

+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Toont de mapbalk"
+
+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Toont de mapbalk"
+
+# shell/e-shell-view-menu.c:423
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Toont de mapbalk"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+# widgets/e-table/e-table-config.glade.h:7
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "_Bcc Field"
+msgstr "Velden"
+
+# widgets/e-table/e-table-config.glade.h:7
 #: ui/evolution-message-composer.xml.h:40
+#, fuzzy
+msgid "_Cc Field"
+msgstr "Velden"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:805
+# calendar/gui/event-editor.c:1279
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Invoegen"
+
+# composer/e-msg-composer.c:891
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:43
+# mail/folder-browser-factory.c:34
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Antwoord-Naar:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Beveiliging"
 
@@ -8599,6 +8892,11 @@ msgstr "_Beveiliging"
 msgid "Add folder to your list of subscribed folders"
 msgstr "map toevoegen aan de lijst van aangemelde mappen"
 
+# shell/e-shell-view-menu.c:365
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Map"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Lijst Verfrissen"
@@ -8619,7 +8917,7 @@ msgstr "Aanmelden"
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-task-editor-dialog.xml.h:5
 msgid "Assig_n Task (FIXME)"
 msgstr "Taak Toewijze_n (FIXME)"
@@ -8628,12 +8926,12 @@ msgstr "Taak Toewijze_n (FIXME)"
 msgid "Find Again"
 msgstr "Opnieuw Zoeken"
 
-# shell/e-shell-view-menu.c:387

+# shell/e-shell-view-menu.c:387
 #: ui/evolution-task-editor-dialog.xml.h:29
 msgid "Meeting Re_quest (FIXME)"
 msgstr "Ve_rzoek Vergadering (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

+# addressbook/contact-editor/e-contact-editor.c:1294
 #: ui/evolution-task-editor-dialog.xml.h:43
 msgid "Redo"
 msgstr "Herhalen"
@@ -8642,7 +8940,7 @@ msgstr "Herhalen"
 msgid "Redo the undone action"
 msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
-# mail/folder-browser-factory.c:34

+# mail/folder-browser-factory.c:34
 #: ui/evolution-task-editor-dialog.xml.h:45
 msgid "Replace"
 msgstr "Vervangen"
@@ -8651,25 +8949,25 @@ msgstr "Vervangen"
 msgid "Replace a string"
 msgstr "Tekenreeks vervangen"
 
-# mail/folder-browser-factory.c:35

+# mail/folder-browser-factory.c:35
 #: ui/evolution-task-editor-dialog.xml.h:47
 msgid "Reply to A_ll (FIXME)"
 msgstr "Iedereen _beantwoorden (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:667

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

+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #: ui/evolution-task-editor-dialog.xml.h:48
 msgid "S_end Status Report (FIXME)"
 msgstr "Verstuur een _status rapport (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:667

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

+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #: ui/evolution-task-editor-dialog.xml.h:49
 msgid "S_kip Occurrence (FIXME)"
 msgstr "Sla Voorkomst over (FIXME)"
 
-# addressbook/contact-editor/e-contact-editor.c:840

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

+# addressbook/contact-editor/e-contact-editor.c:840
+# calendar/gui/event-editor.c:1321
 #: ui/evolution-task-editor-dialog.xml.h:54
 msgid "Save the task and close the dialog box"
 msgstr "Bewaar deze taak en sluit het dialoogvenster"
@@ -8682,18 +8980,18 @@ msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 msgid "Search for a string"
 msgstr "Zoek naar een tekenreeks"
 
-# composer/e-msg-composer.c:948

+# composer/e-msg-composer.c:948
 #: ui/evolution-task-editor-dialog.xml.h:61
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-# composer/e-msg-composer.c:948

+# composer/e-msg-composer.c:948
 #: ui/evolution-task-editor-dialog.xml.h:62
 msgid "Undo the last action"
 msgstr "Maak de laatste bewerking ongedaan"
 
-# shell/e-shell-view-menu.c:378

-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+# shell/e-shell-view-menu.c:378
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
@@ -8701,48 +8999,52 @@ msgstr "_Afspraak (FIXME)"
 msgid "_Mark Complete (FIXME)"
 msgstr "_Markeer als Gedaan (FIXME)"
 
-# shell/e-shell-view-menu.c:384

+# shell/e-shell-view-menu.c:384
 #: ui/evolution-task-editor-dialog.xml.h:84
 msgid "_Reply (FIXME)"
 msgstr "_Beantwoorden (FIXME)"
 
-# shell/e-shell-view-menu.c:404

+# shell/e-shell-view-menu.c:404
 #: ui/evolution-tasks.xml.h:2
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-# shell/e-shell-view-menu.c:398

 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nieuw"
+#, fuzzy
+msgid "New Task"
+msgstr "_Taak"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
 msgstr "Stuur taak als iets anders"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #: ui/evolution-tasks.xml.h:6
 msgid "Tasks Preferences..."
 msgstr "Taak Voorkeuren..."
 
-# shell/e-shell-view-menu.c:159

+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "_Taak"
+
+# shell/e-shell-view-menu.c:159
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Over Evolution..."
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #: ui/evolution.xml.h:3
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-# addressbook/contact-editor/e-contact-editor.c:732

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

 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Aan_passen..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Toolbalken aanpassen"
 
-# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

+# composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
 #: ui/evolution.xml.h:5
 msgid "Customize"
 msgstr "Aanpassen"
@@ -8751,12 +9053,12 @@ msgstr "Aanpassen"
 msgid "Customize toolbars"
 msgstr "Toolbalken aanpassen"
 
-# shell/e-shell-view-menu.c:402

+# shell/e-shell-view-menu.c:402
 #: ui/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-# calendar/gui/gncal-todo.c:488

+# calendar/gui/gncal-todo.c:488
 #: ui/evolution.xml.h:8
 msgid "E_xit"
 msgstr "Stop_pen"
@@ -8765,118 +9067,116 @@ msgstr "Stop_pen"
 msgid "Evolution bar _shortcut"
 msgstr "Evolution balk _snelkoppeling"
 
-# calendar/gui/gncal-todo.c:488

 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Stoppen"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-# shell/e-shell-view-menu.c:443

-#: ui/evolution.xml.h:12
+# shell/e-shell-view-menu.c:443
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importeer een extern bestandsformaat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hoofd toolbalk"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Geef informatie over Evolution weer"
 
-# shell/e-shell-view-menu.c:422

-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "_Mapbalk Tonen"
-
-# shell/e-shell-view-menu.c:419

-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "_Snelkoppelingenbalk Tonen"
-
-# shell/e-shell-view-menu.c:457

-#: ui/evolution.xml.h:18
+# shell/e-shell-view-menu.c:457
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Bug Report Insturen"
 
-# shell/e-shell-view-menu.c:457

-#: ui/evolution.xml.h:19
+# shell/e-shell-view-menu.c:457
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-# shell/e-shell-view-menu.c:458

-#: ui/evolution.xml.h:20
+# shell/e-shell-view-menu.c:458
+#: ui/evolution.xml.h:17
 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:21
+# shell/e-shell-view-menu.c:423
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mapbalk"
 
-# shell/e-shell-view-menu.c:420

-#: ui/evolution.xml.h:22
+# shell/e-shell-view-menu.c:420
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-# shell/e-shell-view-menu.c:452

-#: ui/evolution.xml.h:23
+# shell/e-shell-view-menu.c:452
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Kont_akt Beheerder"
 
-# shell/e-shell-view-menu.c:449

-#: ui/evolution.xml.h:24
+# shell/e-shell-view-menu.c:449
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
-# shell/e-shell-view-menu.c:446

-#: ui/evolution.xml.h:25
+# shell/e-shell-view-menu.c:446
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "De _Mailer Gebruiken"
 
-# shell/e-shell-view-menu.c:159

-#: ui/evolution.xml.h:26
+# calendar/gui/gnome-month-item.c:737
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Bezig"
+
+# shell/e-shell-view-menu.c:159
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
-# shell/e-shell-view-menu.c:365

-#: ui/evolution.xml.h:32
-msgid "_Folder"
+# shell/e-shell-view-menu.c:365
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Map"
 
-# shell/e-shell-view-menu.c:402

-#: ui/evolution.xml.h:33
+# shell/e-shell-view-menu.c:402
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-# composer/e-msg-composer.c:891

-#: ui/evolution.xml.h:35
+# composer/e-msg-composer.c:891
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importeer bestand..."
 
-# shell/e-shell-view-menu.c:440

-#: ui/evolution.xml.h:36
+# shell/e-shell-view-menu.c:440
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-# shell/e-shell-view-menu.c:375

-#: ui/evolution.xml.h:37
+# shell/e-shell-view-menu.c:375
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Bericht versturen"
 
-# addressbook/printing/e-contact-print.glade.h:12

+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nieuwe VMap"
+
+# shell/e-shell-view-menu.c:419
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "In_stellingen:"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "_Verberg de Snelkoppelingenbalk"
 
-# calendar/gui/event-editor.c:1745

+# 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
@@ -8884,96 +9184,101 @@ msgstr "In_stellingen:"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:387

+# 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: 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
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "Huidige Weergave Aanpassen..."
+
 #. 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
@@ -8985,41 +9290,88 @@ msgstr "MDWDVZZ"
 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
+# addressbook/gui/component/addressbook.c:420
+# calendar/gui/calendar-commands.c:544
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Nu"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: 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.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: 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/meeting-time-sel/e-meeting-time-sel.c:389

+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+# widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+# composer/e-msg-composer-address-dialog.glade.h:9
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Zoeken"
+
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Geavanceerd"
+
+# calendar/gui/gncal-todo.c:479
+# composer/e-msg-composer-address-dialog.glade.h:13
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Geavanceerd..."
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Informatie"
 
-# calendar/gui/gnome-month-item.c:737

+# calendar/gui/gnome-month-item.c:737
 #: widgets/misc/e-messagebox.c:148
 msgid "Warning"
 msgstr "Waarschuwing"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #: widgets/misc/e-messagebox.c:162
 msgid "Question"
 msgstr "Vraag"
@@ -9028,14 +9380,14 @@ msgstr "Vraag"
 msgid "Message"
 msgstr "Bericht"
 
-# composer/e-msg-composer.c:942

+# composer/e-msg-composer.c:942
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:213
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: widgets/misc/e-search-bar.c:135
+# composer/e-msg-composer-address-dialog.glade.h:9
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "_Zoeken"
 
@@ -9065,14 +9417,343 @@ msgstr "init_corba: kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "De Evolution werkgroep suite"
+#~ msgid "Disabled"
+#~ msgstr "Uitgezet"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronizeren"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopi�ren Uit Pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopi�ren Naar Pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mengen Uit Pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mengen Naar Pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Originele Auteur:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolution Adresboek Kanaal"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation en Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution adresboek kanaal.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Actie Synchronizeren"
+
+#~ msgid "Conduit state"
+#~ msgstr "Kanaal status"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Geen pilot geconfigureerd, start eerst de 'Pilot Link Eigenschappen' capplet"
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Niet verbonden met de gnome-pilot daemon"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Configureer het adres kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Evolution Adres kanaal"
+
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution Kalender Kanaal"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Configureer het GnomeCal kanaal"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Evolution Kalender kanaal"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Configureer het to-do kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Evolution ToDo kanaal"
+
+# shell/e-shell-view-menu.c:369
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution ToDo Kanaal"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Configuratie programma voor het evolution to-do kanaal.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
+
+#~ msgid "Schedule meeting"
+#~ msgstr "Afspraak Plannen"
+
+# calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+# calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
+#~ msgid "Edit this appointment..."
+#~ msgstr "Bewerk deze afspraak..."
+
+# widgets/e-table/e-table-group.glade.h:9
+#~ msgid "label21"
+#~ msgstr "label21"
+
+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Synchronising IMAP folder"
+#~ msgstr "Bezig met Synchronizeren IMAP map"
+
+# composer/e-msg-composer-hdrs.c:217
+#~ 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:235
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Geef het onderwerp van het bericht"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Bewerk VMap Regel"
+
+#~ msgid "incoming"
+#~ msgstr "inkomend"
+
+# calendar/gui/calendar-commands.c:56
+#~ msgid "outgoing"
+#~ msgstr "uitgaand"
+
+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
+#~ msgid "Deleted"
+#~ msgstr "Verwijderd"
+
+#~ msgid "Draft"
+#~ msgstr "Klad"
+
+#~ msgid "Set Flag"
+#~ msgstr "Stel Vlag in"
+
+#~ msgid "matches regex"
+#~ msgstr "is gelijk aan reguliere expressie"
+
+# mail/mail-config.c:1490
+#~ msgid "Add Rule"
+#~ msgstr "Regel Toevoegen"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "VMap Regel Toevoegen"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Bewerk VMap Regel"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Bericht of onderwerp bevat"
+
+#~ msgid "Body contains"
+#~ msgstr "Bericht bevat"
+
+# mail/message-list.c:495
+#~ msgid "Subject contains"
+#~ msgstr "Onderwerp bevat"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Bericht bevat niet"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Onderwerp bevat niet"
+
+# addressbook/contact-editor/e-contact-editor.c:808
+# calendar/gui/event-editor.c:1282
+#~ msgid "Sender contains"
+#~ msgstr "Afzender bevat"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importeert mbox bestanden naar Evolution"
+
+# composer/e-msg-composer-attachment.glade.h:7
+#~ msgid "Account Properties"
+#~ msgstr "Account Eigenschappen"
+
+# mail/mail-config.c:305
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-Mail Adres:"
+
+#~ msgid "Include in \"Get Mail\" operations."
+#~ msgstr "Opnemen in \"Get Mail\" bewerkingen."
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Inkomende E-Mail Server"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Andere"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Uitgaande E-Mail Server"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#~ msgid "Servers"
+#~ msgstr "Servers"
+
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan locatie `%s' niet openen:\n"
+#~ "%s"
+
+# mail/folder-browser-factory.c:95
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "_Adresboek Configuratie..."
+
+# addressbook/gui/component/addressbook.c:425
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Druk Kontakten af..."
+
+# calendar/gui/calendar-commands.c:659
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lender"
+
+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Kalender Instellingen..."
+
+# calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#~ msgid "_Print this calendar"
+#~ msgstr "_Druk deze kalender af"
+
+#~ msgid "Create Rule"
+#~ msgstr "Maak Regel"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filteren op Afzender"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filteren op Geadresseerden"
+
+# mail/folder-browser-factory.c:29
+#~ msgid "Get Mail"
+#~ msgstr "Post Ophalen"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "_Markeer Als Gelezen"
+
+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markeer Als _Ongelezen"
+
+# calendar/gui/print.c:1249
+#~ msgid "Print Preview of message..."
+#~ msgstr "Afdrukvoorbeeld van bericht..."
+
+#~ msgid "Print message..."
+#~ msgstr "Bericht afdrukken..."
+
+# mail/folder-browser-factory.c:35
+#~ msgid "Reply to _Sender"
+#~ msgstr "Af_zender beantwoorden"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Geef _Alle Berichten weer"
+
+# shell/e-shell-view-menu.c:402
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Configureer Map..."
+
+# composer/e-msg-composer.c:894
+#~ msgid "_Edit Message"
+#~ msgstr "Bericht _Bewerken"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filteren op Onderwerp"
+
+# mail/folder-browser-factory.c:95
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mail Configuratie..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Openen in Nieuw Venster"
+
+#~ msgid "_Print Message"
+#~ msgstr "Bericht A_fdrukken"
+
+# composer/e-msg-composer.c:463
+#~ msgid "_Save Message As..."
+#~ msgstr "Bericht Op_slaan als..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_VMap op Onderwerp"
+
+# shell/e-shell-view-menu.c:398
+#~ msgid "New"
+#~ msgstr "Nieuw"
+
+# addressbook/contact-editor/e-contact-editor.c:732
+# calendar/gui/event-editor.c:1207
+#~ msgid "Customi_ze..."
+#~ msgstr "Aan_passen..."
+
+# shell/e-shell-view-menu.c:422
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "_Mapbalk Tonen"
+
+# shell/e-shell-view-menu.c:419
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "_Snelkoppelingenbalk Tonen"
+
+# addressbook/printing/e-contact-print.glade.h:12
+#~ msgid "_Settings"
+#~ msgstr "In_stellingen:"
 
 #~ msgid "Reflow Test"
 #~ msgstr "Reflow Test"
 
-# shell/e-shell-view-menu.c:161

+# shell/e-shell-view-menu.c:161
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
@@ -9089,21 +9770,18 @@ msgstr "De Evolution werkgroep suite"
 #~ "Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
 #~ "het opslaan van post op de lokale schijf."
 
-#~ msgid "No such message: %s"
-#~ msgstr "Een dergelijk bericht bestaat niet"
-
 #~ msgid "Connect to server"
 #~ msgstr "Kon niet verbinden met POP server op %s."
 
-# mail/component-factory.c:196

+# 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

+# mail/main.c:62
 #~ msgid "Notes Component: Could not initialize bonobo"
 #~ msgstr "Notitie gedeelte: Kon Bonobo niet initializeren"
 
-# addressbook/contact-editor/fullname-strings.h:13

+# addressbook/contact-editor/fullname-strings.h:13
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -9117,7 +9795,7 @@ msgstr "De Evolution werkgroep suite"
 #~ "Mvr.\n"
 #~ "Dr.\n"
 
-# addressbook/contact-editor/fullname-strings.h:18

+# addressbook/contact-editor/fullname-strings.h:18
 #~ msgid ""
 #~ "\n"
 #~ "Sr.\n"
@@ -9138,9 +9816,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Open..."
 #~ msgstr "_Openen"
 
-#~ msgid "Open the task"
-#~ msgstr "Open de taak"
-
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Lokale opslag locaties hebben geen standaard map"
 
@@ -9169,24 +9844,20 @@ msgstr "De Evolution werkgroep suite"
 #~ "Kon bestand %s niet openen:\n"
 #~ "%s"
 
-# shell/e-shell-view-menu.c:404

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

-#~ msgid "Register local folder"
-#~ msgstr "Registreren lokale map"
-
 #~ msgid ""
 #~ "Unable to register folder '%s':\n"
 #~ "%s"
 #~ msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
 
-# mail/mail-ops.c:374

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

+# mail/mail-ops.c:374
 #~ msgid "Fetch email from %s"
 #~ msgstr "Post ophalen van %s"
 
@@ -9220,8 +9891,8 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Copy messages from \"%s\" into \"%s\""
 #~ msgstr "Kopi�er berichten van \"%s\" naar \"%s\""
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #~ msgid "(No description)"
 #~ msgstr "(Geen beschrijving)"
 
@@ -9245,20 +9916,20 @@ msgstr "De Evolution werkgroep suite"
 #~ "Fout tijdens `%s':\n"
 #~ "%s"
 
-# mail/mail-threads.c:623

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

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

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

+# mail/mail-threads.c:849
 #~ msgid "User cancelled query."
 #~ msgstr "Gebruiker heeft vraag afgebroken."
 
@@ -9274,7 +9945,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Bezig met ophalen bericht %d van %d"
 
-# mail/folder-browser-factory.c:41

+# mail/folder-browser-factory.c:41
 #~ msgid "Writing message %d of %d"
 #~ msgstr "Bezig met wegschrijven bericht %d van %d"
 
@@ -9290,267 +9961,262 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Afmelden bij map \"%s\""
 
-# addressbook/contact-editor/e-contact-editor.c:643

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

+# 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

+# 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:646

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

+# addressbook/contact-editor/e-contact-editor.c:646
+# calendar/gui/event-editor.c:1121
 #~ msgid "FIXME: _Mail Message"
 #~ msgstr "FIXME: _Mail bericht"
 
-# addressbook/contact-editor/e-contact-editor.c:647

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

+# addressbook/contact-editor/e-contact-editor.c:647
+# calendar/gui/event-editor.c:1122
 #~ msgid "FIXME: _Contact"
 #~ msgstr "FIXME: _Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: _Task"
 #~ msgstr "FIXME: _Taak"
 
-# addressbook/contact-editor/e-contact-editor.c:649

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

+# addressbook/contact-editor/e-contact-editor.c:649
+# calendar/gui/event-editor.c:1124
 #~ msgid "FIXME: Task _Request"
 #~ msgstr "FIXME: Taak Verzoek"
 
-# addressbook/contact-editor/e-contact-editor.c:650

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

+# addressbook/contact-editor/e-contact-editor.c:650
+# calendar/gui/event-editor.c:1125
 #~ msgid "FIXME: _Journal Entry"
 #~ msgstr "FIXME: Dagboek Item"
 
-# addressbook/contact-editor/e-contact-editor.c:651

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

+# addressbook/contact-editor/e-contact-editor.c:651
+# calendar/gui/event-editor.c:1126
 #~ 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

+# 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
 #~ msgid "FIXME: Ch_oose Form..."
 #~ msgstr "FIXME: Seleecteer F_ormulier"
 
-# addressbook/contact-editor/e-contact-editor.c:658

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

+# addressbook/contact-editor/e-contact-editor.c:658
+# calendar/gui/event-editor.c:1133
 #~ msgid "FIXME: _Memo Style"
 #~ msgstr "FIXME: _Memo Stijl"
 
-# addressbook/contact-editor/e-contact-editor.c:660

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

+# addressbook/contact-editor/e-contact-editor.c:660
+# calendar/gui/event-editor.c:1135
 #~ 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

+# addressbook/contact-editor/e-contact-editor.c:667
+# calendar/gui/event-editor.c:1142
 #~ msgid "FIXME: S_end"
 #~ msgstr "FIXME: V_ersturen"
 
-# calendar/gui/event-editor.c:1333

+# calendar/gui/event-editor.c:1333
 #~ msgid "FIXME: Save Attac_hments..."
 #~ msgstr "FIXME: Aanhangels Opslaan..."
 
-# addressbook/contact-editor/e-contact-editor.c:674

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

+# addressbook/contact-editor/e-contact-editor.c:674
+# calendar/gui/event-editor.c:1149
 #~ msgid "FIXME: _Move to Folder..."
 #~ msgstr "FIXME: Verplaats naar Folder..."
 
-# addressbook/contact-editor/e-contact-editor.c:675

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

+# addressbook/contact-editor/e-contact-editor.c:675
+# calendar/gui/event-editor.c:1150
 #~ 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

+# 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:678

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

+# addressbook/contact-editor/e-contact-editor.c:678
+# calendar/gui/event-editor.c:1153
 #~ msgid "FIXME: Print Pre_view"
 #~ msgstr "FIXME: Afdruk_voorbeeld"
 
-# addressbook/contact-editor/e-contact-editor.c:699

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

+# addressbook/contact-editor/e-contact-editor.c:699
+# calendar/gui/event-editor.c:1174
 #~ msgid "FIXME: Paste _Special..."
 #~ msgstr "FIXME: Plakken _Speciaal..."
 
-# addressbook/contact-editor/e-contact-editor.c:704

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

+# addressbook/contact-editor/e-contact-editor.c:704
+# calendar/gui/event-editor.c:1179
 #~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "Markeer Als Ongelezen"
 
-# addressbook/contact-editor/e-contact-editor.c:708

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

+# addressbook/contact-editor/e-contact-editor.c:708
+# calendar/gui/event-editor.c:1183
 #~ 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

+# 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
 #~ 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

+# 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
 #~ msgid "FIXME: _Unread Item"
 #~ msgstr "FIXME: Ongelezen Item"
 
-# addressbook/contact-editor/e-contact-editor.c:727

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

+# addressbook/contact-editor/e-contact-editor.c:727
+# calendar/gui/event-editor.c:1202
 #~ msgid "FIXME: _Standard"
 #~ msgstr "FIXME: _Standaard"
 
-# addressbook/contact-editor/e-contact-editor.c:729

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

+# 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

+# 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:740

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

+# addressbook/contact-editor/e-contact-editor.c:740
+# calendar/gui/event-editor.c:1217
 #~ msgid "_Toolbars"
 #~ msgstr "_Werkbalk"
 
-# addressbook/contact-editor/e-contact-editor.c:745

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

+# addressbook/contact-editor/e-contact-editor.c:745
+# calendar/gui/event-editor.c:1222
 #~ msgid "FIXME: _File..."
 #~ msgstr "FIXME: Bestand..."
 
-# addressbook/contact-editor/e-contact-editor.c:746

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

+# addressbook/contact-editor/e-contact-editor.c:746
+# calendar/gui/event-editor.c:1223
 #~ msgid "FIXME: It_em..."
 #~ msgstr "FIXME: It_em..."
 
-# addressbook/contact-editor/e-contact-editor.c:747

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

+# addressbook/contact-editor/e-contact-editor.c:747
+# calendar/gui/event-editor.c:1224
 #~ msgid "FIXME: _Object..."
 #~ msgstr "FIXME: _Object..."
 
-# addressbook/contact-editor/e-contact-editor.c:752

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

+# addressbook/contact-editor/e-contact-editor.c:752
+# calendar/gui/event-editor.c:1229
 #~ msgid "FIXME: _Font..."
 #~ msgstr "FIXME: _Font..."
 
-# addressbook/contact-editor/e-contact-editor.c:753

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

+# addressbook/contact-editor/e-contact-editor.c:753
+# calendar/gui/event-editor.c:1230
 #~ msgid "FIXME: _Paragraph..."
 #~ msgstr "FIXME: _Paragraaf..."
 
-# addressbook/contact-editor/e-contact-editor.c:760

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

+# addressbook/contact-editor/e-contact-editor.c:760
+# calendar/gui/event-editor.c:1237
 #~ 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

+# addressbook/contact-editor/e-contact-editor.c:761
+# calendar/gui/event-editor.c:1238
 #~ 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

+# addressbook/contact-editor/e-contact-editor.c:763
+# calendar/gui/event-editor.c:1240
 #~ msgid "FIXME: Publish _Form..."
 #~ msgstr "FIXME: Publiceer een _Formulier..."
 
-# addressbook/contact-editor/e-contact-editor.c:764

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

+# addressbook/contact-editor/e-contact-editor.c:764
+# calendar/gui/event-editor.c:1241
 #~ 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

+# addressbook/contact-editor/e-contact-editor.c:766
+# calendar/gui/event-editor.c:1243
 #~ msgid "FIXME: Script _Debugger"
 #~ msgstr "FIXME: Script _Debugger"
 
-# addressbook/contact-editor/e-contact-editor.c:771

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

+# addressbook/contact-editor/e-contact-editor.c:771
+# calendar/gui/event-editor.c:1248
 #~ msgid "FIXME: _Spelling..."
 #~ msgstr "FIXME: _Spelling..."
 
-# addressbook/contact-editor/e-contact-editor.c:773

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

+# addressbook/contact-editor/e-contact-editor.c:773
+# calendar/gui/event-editor.c:1253
 #~ msgid "_Forms"
 #~ msgstr "_Formulier"
 
-# addressbook/contact-editor/e-contact-editor.c:778

+# addressbook/contact-editor/e-contact-editor.c:778
 #~ msgid "FIXME: _New Contact"
 #~ msgstr "FIXME: _Nieuw Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:779

+# 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

+# 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:781

+# addressbook/contact-editor/e-contact-editor.c:781
 #~ msgid "FIXME: New _Message to Contact"
 #~ msgstr "FIXME: Nieuwe Brief naar Contact"
 
-# addressbook/contact-editor/e-contact-editor.c:783

+# 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

+# 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

+# 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

+# 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

+# 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

+# 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

+# 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

+# addressbook/contact-editor/e-contact-editor.c:792
 #~ msgid "FIXME: Forward as _vCard"
 #~ msgstr "FIXME: Doorsturen als _vCard"
 
-# addressbook/contact-editor/e-contact-editor.c:793

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

+# addressbook/contact-editor/e-contact-editor.c:793
+# calendar/gui/event-editor.c:1266
 #~ msgid "FIXME: For_ward"
 #~ msgstr "FIXME: Doorsturen"
 
-# addressbook/contact-editor/e-contact-editor.c:805

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

-#~ msgid "_Insert"
-#~ msgstr "_Invoegen"
-
-# addressbook/contact-editor/e-contact-editor.c:856

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

+# 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

+# addressbook/contact-editor/e-contact-editor.c:859
+# calendar/gui/event-editor.c:1341
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Volgende"
 
-# widgets/shortcut-bar/e-group-bar.c:632

+# widgets/shortcut-bar/e-group-bar.c:632
 #~ msgid "Group %i"
 #~ msgstr "Group %i"
 
@@ -9560,27 +10226,27 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "task-editor-dialog"
 #~ msgstr "taak-bewerkings-dialoogvenster"
 
-# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

+# calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
 #~ msgid "Days"
 #~ msgstr "Dagen"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #~ msgid "Hours"
 #~ msgstr "Uren"
 
-# mail/mail-config.c:1199

+# mail/mail-config.c:1199
 #~ msgid "Mail _to:"
 #~ msgstr "Post _naar:"
 
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
 #~ msgid "Minutes"
 #~ msgstr "Minuten"
 
-# calendar/gui/gncal-todo.c:428

+# calendar/gui/gncal-todo.c:428
 #~ msgid "Time"
 #~ msgstr "Resterende tijd"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:7

+# addressbook/contact-editor/e-contact-editor-strings.h:7
 #~ msgid "_Audio"
 #~ msgstr "_Geluid"
 
@@ -9593,9 +10259,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "event-editor-dialog"
 #~ msgstr "gebeurtenis-bewerkings-dialoog"
 
-#~ msgid "Server disconnected."
-#~ msgstr "Server verbrak de verbinding."
-
 #~ msgid "UNIX MH-format mail directories (CamelLocal version)"
 #~ msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
 
@@ -9608,26 +10271,26 @@ msgstr "De Evolution werkgroep suite"
 #~ 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

+# addressbook/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #~ msgid "Hide selected"
 #~ msgstr "Verwijderd"
 
-# 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/contact-editor/e-contact-editor.c:852
+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
+# mail/folder-browser-factory.c:45
 #~ msgid "Hide deleted"
 #~ msgstr "Verwijderd"
 
-# mail/message-list.c:495

+# mail/message-list.c:495
 #~ msgid "Hide Subject"
 #~ msgstr "Onderwerp"
 
 #~ msgid "Hide from Sender"
 #~ msgstr "Filter op Afzender"
 
-# mail/message-list.c:495

+# mail/message-list.c:495
 #~ msgid "Hide Subject \"%s\""
 #~ msgstr "Onderwerp is %s"
 
@@ -9637,18 +10300,15 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Congratulations, your mail configuration is complete.\n"
 #~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-# mail/folder-browser-factory.c:34

+# mail/folder-browser-factory.c:34
 #~ msgid "Reply-to:"
 #~ msgstr "Antwoord-naar:"
 
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
 #~ msgid "Server Timeouts"
 #~ msgstr "Server Type: "
 
-# mail/mail-config.c:262

+# 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 "
@@ -9658,34 +10318,30 @@ msgstr "De Evolution werkgroep suite"
 #~ "het het bedrijf oppgeven, en de naam van het bestand waar je signature in "
 #~ "staat."
 
-# mail/mail-config.c:277

+# 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

+# 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

+# 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

+# 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"
 
-# mail/mail-config.c:1220

+# mail/mail-config.c:1220
 #~ msgid "Mail source type:"
 #~ msgstr "Post bron type:"
 
-# mail/mail-config.c:960

+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9698,12 +10354,12 @@ msgstr "De Evolution werkgroep suite"
 #~ "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

+# 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

+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of news server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9716,11 +10372,11 @@ msgstr "De Evolution werkgroep suite"
 #~ "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.c:1220
 #~ msgid "Mail transport type:"
 #~ msgstr "Mail transport type:"
 
-# mail/mail-config.c:960

+# mail/mail-config.c:960
 #~ msgid ""
 #~ "Select the kind of mail server you have, and enter the relevant information "
 #~ "about it.\n"
@@ -9732,23 +10388,23 @@ msgstr "De Evolution werkgroep suite"
 #~ "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.c:1345
 #~ msgid "Add Identity"
 #~ msgstr "Identiteit Toevoegen"
 
-# mail/mail-config.c:1343

+# mail/mail-config.c:1343
 #~ msgid "Edit Identity"
 #~ msgstr "Identiteit Bewerken"
 
-# mail/mail-config.c:1488

+# mail/mail-config.c:1488
 #~ msgid "Edit Source"
 #~ msgstr "Bron Bewerken"
 
-# mail/mail-config.c:1658

+# mail/mail-config.c:1658
 #~ msgid "Add News Server"
 #~ msgstr "Nieuwe Nieuws Server Toevoegen"
 
-# mail/mail-config.c:1656

+# mail/mail-config.c:1656
 #~ msgid "Edit News Server"
 #~ msgstr "Bewerk Nieuws Server"
 
@@ -9764,23 +10420,23 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Query authorization at \"%s\""
 #~ msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
-# mail/mail-config.c:1180

+# mail/mail-config.c:1180
 #~ msgid "Identities"
 #~ msgstr "Identiteiten"
 
-# mail/mail-config.c:1199

+# mail/mail-config.c:1199
 #~ msgid "Mail Sources"
 #~ msgstr "Post Bronnen"
 
-# mail/mail-config.c:1220

+# mail/mail-config.c:1220
 #~ msgid "Mail Transport"
 #~ msgstr "Post Transport"
 
-# mail/mail-config.c:1658

+# mail/mail-config.c:1658
 #~ msgid "News Servers"
 #~ msgstr "Nieuws Servers"
 
-# mail/mail-config.c:1490

+# mail/mail-config.c:1490
 #~ msgid "News Sources"
 #~ msgstr "Nieuws Bronnen"
 
@@ -9791,253 +10447,249 @@ msgstr "De Evolution werkgroep suite"
 #~ msgstr ""
 #~ "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
 
-# calendar/gui/calendar-commands.c:664

+# calendar/gui/calendar-commands.c:664
 #~ msgid "Open a calendar"
 #~ msgstr "Open een kalender"
 
-# calendar/gui/event-editor.c:1250

+# calendar/gui/event-editor.c:1250
 #~ msgid "FIXME: Chec_k Names"
 #~ msgstr "FIXME: Controleer Namen"
 
-# addressbook/contact-editor/e-contact-editor.c:862

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

+# addressbook/contact-editor/e-contact-editor.c:862
+# calendar/gui/event-editor.c:1343
 #~ msgid "FIXME: Help"
 #~ msgstr "FIXME: Help"
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: In_complete Task"
 #~ msgstr "FIXME: Niet complete taak"
 
-# addressbook/contact-editor/e-contact-editor.c:848

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

+# addressbook/contact-editor/e-contact-editor.c:848
+# calendar/gui/event-editor.c:1327
 #~ msgid "FIXME: Insert File"
 #~ msgstr "FIXME: Bestand Bijvoegen"
 
-# calendar/gui/event-editor.c:1260

+# calendar/gui/event-editor.c:1260
 #~ msgid "FIXME: Rec_urrence..."
 #~ msgstr "FIXME: _Herhaling..."
 
-# addressbook/contact-editor/e-contact-editor.c:729

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

+# addressbook/contact-editor/e-contact-editor.c:729
+# calendar/gui/event-editor.c:1204
 #~ msgid "FIXME: _Formatting"
 #~ msgstr "FIXME: _Opmaak"
 
-# calendar/gui/event-editor.c:1258

+# calendar/gui/event-editor.c:1258
 #~ msgid "FIXME: _New Appointment"
 #~ msgstr "FIXME: _Nieuwe Afspraak"
 
 #~ msgid "Find _Again"
 #~ msgstr "Opnieuw _Vinden"
 
-# addressbook/gui/component/addressbook.c:424

+# addressbook/gui/component/addressbook.c:424
 #~ msgid "_Find..."
 #~ msgstr "_Vind..."
 
-# addressbook/contact-editor/e-contact-editor.c:1294

+# addressbook/contact-editor/e-contact-editor.c:1294
 #~ msgid "_Redo"
 #~ msgstr "_Herhalen"
 
-# composer/e-msg-composer.c:463

+# composer/e-msg-composer.c:463
 #~ msgid "_Replace..."
 #~ msgstr "Ve_rvangen..."
 
-# composer/e-msg-composer.c:948

+# composer/e-msg-composer.c:948
 #~ msgid "_Undo"
 #~ msgstr "_Ongedaan maken"
 
-# mail/mail-config.c:1490

+# mail/mail-config.c:1490
 #~ msgid "_Source"
 #~ msgstr "_Bron"
 
-# addressbook/contact-editor/categories-strings.h:9

+# addressbook/contact-editor/categories-strings.h:9
 #~ msgid "Available Categories:"
 #~ msgstr "Beschikbare Categorie�n:"
 
 #~ msgid "External Directories"
 #~ msgstr "Externe Directories"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

+# addressbook/gui/component/ldap-server-dialog.glade.h:9
 #~ msgid "Port Number:"
 #~ msgstr "Poort:"
 
-# calendar/gui/calendar-commands.c:56

+# calendar/gui/calendar-commands.c:56
 #~ msgid "Outline:"
 #~ msgstr "Buitenlijn:"
 
-# calendar/gui/calendar-commands.c:57

+# calendar/gui/calendar-commands.c:57
 #~ msgid "Headings:"
 #~ msgstr "Koppen:"
 
-# calendar/gui/calendar-commands.c:58

-#~ msgid "Empty days:"
-#~ msgstr "Lege dagen:"
-
-# calendar/gui/calendar-commands.c:60

+# calendar/gui/calendar-commands.c:60
 #~ msgid "Highlighted day:"
 #~ msgstr "Gemarkeerde dag:"
 
-# calendar/gui/calendar-commands.c:61

+# calendar/gui/calendar-commands.c:61
 #~ msgid "Day numbers:"
 #~ msgstr "Dag nummers:"
 
-# calendar/gui/calendar-commands.c:62

+# calendar/gui/calendar-commands.c:62
 #~ msgid "Current day's number:"
 #~ msgstr "Nummer van vandaag:"
 
-# calendar/gui/calendar-commands.c:63

+# calendar/gui/calendar-commands.c:63
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "To-Do item dat nog niet verlopen is:"
 
-# calendar/gui/calendar-commands.c:64

+# calendar/gui/calendar-commands.c:64
 #~ msgid "To-Do item that is due today:"
 #~ msgstr "To-Do item dat vandaag af moet:"
 
-# calendar/gui/calendar-commands.c:65

+# calendar/gui/calendar-commands.c:65
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "To-Do item dat af moest zijn:"
 
-# calendar/gui/getdate.y:395

+# calendar/gui/getdate.y:395
 #~ msgid "may"
 #~ msgstr "may"
 
-# calendar/gui/getdate.y:400

+# calendar/gui/getdate.y:400
 #~ msgid "sept"
 #~ msgstr "sept"
 
-# calendar/gui/getdate.y:404

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

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

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

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

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

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

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

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

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

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

+# calendar/gui/getdate.y:414
 #~ msgid "saturday"
 #~ msgstr "zaterdag"
 
-# calendar/gui/getdate.y:422

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

+# calendar/gui/getdate.y:427
 #~ msgid "min"
 #~ msgstr "min"
 
-# calendar/gui/getdate.y:429

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

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

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

+# calendar/gui/getdate.y:437
 #~ msgid "today"
 #~ msgstr "vandaag"
 
-# calendar/gui/getdate.y:439

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

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

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

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

+# calendar/gui/getdate.y:444
 #~ msgid "third"
 #~ msgstr "derde"
 
-# calendar/gui/getdate.y:445

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

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

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

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

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

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

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

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

+# calendar/gui/getdate.y:453
 #~ msgid "twelfth"
 #~ msgstr "twaalfde"
 
-# calendar/gui/getdate.y:454

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

+# calendar/gui/goto.c:82
 #~ msgid "Year:"
 #~ msgstr "Jaar:"
 
-# calendar/gui/goto.c:275

+# calendar/gui/goto.c:275
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -10047,26 +10699,26 @@ msgstr "De Evolution werkgroep suite"
 #~ "Wanneer op je die dag klikt, ga je naar die\n"
 #~ "dag toe."
 
-# mail/mail-config.c:1199

+# mail/mail-config.c:1199
 #~ msgid "Mail Source"
 #~ msgstr "Post Bron"
 
 #~ msgid "Send a message without a subject"
 #~ msgstr "Stuur een bericht zonder onderwerp"
 
-# mail/folder-browser-factory.c:77

+# mail/folder-browser-factory.c:77
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Legen \"%s\""
 
-# mail/folder-browser-factory.c:41

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

+# mail/folder-browser-factory.c:41
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Markeer berichten in map \"%s\""
 
-# mail/folder-browser-factory.c:41

+# mail/folder-browser-factory.c:41
 #~ msgid "Marking message %d of %d"
 #~ msgstr "Bezig met markeren bericht %d van %d"
 
@@ -10079,14 +10731,14 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Attach messages from \"%s\""
 #~ msgstr "Voeg berichten van \"%s\" bij"
 
-# mail/folder-browser-factory.c:37

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

+# mail/folder-browser-factory.c:37
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Bericht \"%s\" doorsturen"
 
@@ -10128,10 +10780,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Display message UID \"%s\""
 #~ msgstr "Geef UID van bericht \"%s\" weer"
 
-# calendar/gui/prop.c:519

-#~ msgid "Clear message display"
-#~ msgstr "Maak berichtweergave leeg"
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Bezig met openen berichten uit map \"%s\""
 
@@ -10150,35 +10798,31 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Bezig met opslaan berichten uit map \"%s\""
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #~ msgid "Rebuilding message view"
 #~ msgstr "Bezig met herstructureren van bericht weergave"
 
-# composer/e-msg-composer.c:894

+# composer/e-msg-composer.c:894
 #~ msgid "Rebuild message view"
 #~ msgstr "Herstructureer bericht weergave"
 
-# addressbook/gui/component/addressbook.c:514

+# addressbook/gui/component/addressbook.c:514
 #~ msgid "N_ew Directory Server"
 #~ msgstr "Ni_euwe Directory Server"
 
-# shell/e-shell-view-menu.c:474

-#~ msgid "_Actions"
-#~ msgstr "_Acties"
-
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Bewaar Kalender Als"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

+# mail/mail-config.c:1163 mail/mail-config.c:1242
 #~ msgid "_Mail Configuration"
 #~ msgstr "_Post Configuratie"
 
-# mail/mail-threads.c:814

+# mail/mail-threads.c:814
 #~ msgid "Could not create summary"
 #~ msgstr "Kon samenvatting niet maken"
 
-# shell/e-shell.c:299

+# shell/e-shell.c:299
 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan bericht niet vergaren: %s"
 
@@ -10198,7 +10842,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Summary mismatch, X-Evolution header missing"
 #~ msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
 
-# shell/e-setup.c:84

+# shell/e-setup.c:84
 #~ msgid "Cannot copy data to output file: %s"
 #~ msgstr "Kan de gegevens niet naar het uitvoerbestand kopi�ren: %s"
 
@@ -10220,12 +10864,12 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Local mail directory %s"
 #~ msgstr "Directory voor lokale post %s"
 
-# mail/component-factory.c:196

+# mail/component-factory.c:196
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
 #~ "Kan het post \"hash\" opslag gedeelte van Evolution niet initialiseren."
 
-# composer/e-msg-composer.c:906

+# composer/e-msg-composer.c:906
 #~ msgid "Forward as Attachment"
 #~ msgstr "Bekijk als Bijvoegsel"
 
@@ -10238,33 +10882,33 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Cannot fork %s: %s"
 #~ msgstr "Kan %s niet starten: %s"
 
-# addressbook/printing/e-contact-print.glade.h:24

+# addressbook/printing/e-contact-print.glade.h:24
 #~ msgid "Bold"
 #~ msgstr "Vet"
 
 #~ msgid "Sets something as bold"
 #~ msgstr "Stelt iets in als vet"
 
-# addressbook/gui/component/alphabet.glade.h:7

+# addressbook/gui/component/alphabet.glade.h:7
 #~ msgid "window2"
 #~ msgstr "venster2"
 
 #~ msgid "does not match regex"
 #~ msgstr "niet gelijk aan reguliere expressie"
 
-# calendar/gui/gncal-todo.c:325

+# calendar/gui/gncal-todo.c:325
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Optionele Velden Toevoegen..."
 
-# mail/mail-config.c:1345

+# mail/mail-config.c:1345
 #~ msgid "Additional Identity Fields"
 #~ msgstr "Optionele Identiteits Velden"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:7

+# calendar/gui/dialogs/alarm-notify.glade.h:7
 #~ msgid "Browse..."
 #~ msgstr "Bladeren..."
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

+# mail/mail-config.c:1163 mail/mail-config.c:1242
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Bewerk Post Configuratie Instellingen"
 
@@ -10291,7 +10935,7 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Preferred type: "
 #~ msgstr "Voorkeurstype:"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #~ msgid "Sending Mail"
 #~ msgstr "Bezig met versturen Post"
 
@@ -10307,66 +10951,66 @@ msgstr "De Evolution werkgroep suite"
 #~ msgstr ""
 #~ "Je mail server ondersteund de volgende authenticatie typen. Alsjeblieft"
 
-# calendar/gui/calendar-commands.c:659

+# calendar/gui/calendar-commands.c:659
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nieuwe Ka_lender"
 
-# calendar/gui/calendar-commands.c:682

+# calendar/gui/calendar-commands.c:682
 #~ msgid "_New appointment..."
 #~ msgstr "_Nieuwe Afspraak..."
 
 #~ msgid "_Open"
 #~ msgstr "_Openen"
 
-# shell/e-shell-view-menu.c:404

+# shell/e-shell-view-menu.c:404
 #~ msgid "_Create New Folder..."
 #~ msgstr "Nieu_we map aanmaken..."
 
-# calendar/gui/gncal-todo.c:137

+# calendar/gui/gncal-todo.c:137
 #~ msgid "Create to-do item"
 #~ msgstr "Maak een To-Do item aan"
 
-# calendar/gui/gncal-todo.c:137

+# calendar/gui/gncal-todo.c:137
 #~ msgid "Edit to-do item"
 #~ msgstr "Bewerk To-Do item"
 
-# calendar/gui/gncal-todo.c:181

+# calendar/gui/gncal-todo.c:181
 #~ msgid "Due Date:"
 #~ msgstr "Verloop Datum:"
 
-# calendar/gui/gncal-todo.c:190

+# calendar/gui/gncal-todo.c:190
 #~ msgid "Priority:"
 #~ msgstr "Prioriteit:"
 
-# calendar/gui/gncal-todo.c:207

+# calendar/gui/gncal-todo.c:207
 #~ msgid "Item Comments:"
 #~ msgstr "Item Commentaar:"
 
-# calendar/gui/prop.c:330

+# calendar/gui/prop.c:330
 #~ msgid "Time display"
 #~ msgstr "Tijd weergave"
 
-# calendar/gui/prop.c:334

+# calendar/gui/prop.c:334
 #~ msgid "Time format"
 #~ msgstr "Tijdsformaat"
 
-# calendar/gui/prop.c:335

+# calendar/gui/prop.c:335
 #~ msgid "12-hour (AM/PM)"
 #~ msgstr "12-uurs (AM/PM)"
 
-# calendar/gui/prop.c:336

+# calendar/gui/prop.c:336
 #~ msgid "24-hour"
 #~ msgstr "24-uurs"
 
-# calendar/gui/prop.c:346

+# calendar/gui/prop.c:346
 #~ msgid "Weeks start on"
 #~ msgstr "Week begint op"
 
-# calendar/gui/prop.c:358

+# calendar/gui/prop.c:358
 #~ msgid "Day range"
 #~ msgstr "Dag bereik"
 
-# calendar/gui/prop.c:369

+# calendar/gui/prop.c:369
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10377,59 +11021,59 @@ msgstr "De Evolution werkgroep suite"
 #~ "in het dag en week overzicht. Tijden buiten dit bereik\n"
 #~ "zullen niet automatisch worden weergegeven."
 
-# calendar/gui/prop.c:396

+# calendar/gui/prop.c:396
 #~ msgid "Day end:"
 #~ msgstr "Einddag:"
 
-# calendar/gui/prop.c:519

+# calendar/gui/prop.c:519
 #~ msgid "Colors for display"
 #~ msgstr "Kleuren voor beeld"
 
-# calendar/gui/prop.c:599

+# calendar/gui/prop.c:599
 #~ msgid "Show on TODO List:"
 #~ msgstr "Weergeven op To-Do Lijst:"
 
-# calendar/gui/prop.c:637

+# calendar/gui/prop.c:637
 #~ msgid "To Do List style options:"
 #~ msgstr "To-Do lijst stijl opties:"
 
-# calendar/gui/prop.c:642

+# calendar/gui/prop.c:642
 #~ msgid "Highlight overdue items"
 #~ msgstr "Markeer items die zijn verlopen"
 
-# calendar/gui/prop.c:645

+# calendar/gui/prop.c:645
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Markeer items die nog niet zijn verlopen"
 
-# calendar/gui/prop.c:648

+# calendar/gui/prop.c:648
 #~ msgid "Highlight items due today"
 #~ msgstr "Markeer items die vandaag verlopen"
 
-# calendar/gui/prop.c:678

+# calendar/gui/prop.c:678
 #~ msgid "To Do List Properties"
 #~ msgstr "To-Do lijst Eigenschappen"
 
-# calendar/gui/prop.c:681

+# calendar/gui/prop.c:681
 #~ msgid "To Do List"
 #~ msgstr "To-Do Lijst"
 
-# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

+# calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 #~ msgid "Preferences"
 #~ msgstr "Instellingen"
 
-# calendar/gui/prop.c:783

+# calendar/gui/prop.c:783
 #~ msgid "Alarm Properties"
 #~ msgstr "Alarm Eigenschappen"
 
-# calendar/gui/prop.c:793

+# calendar/gui/prop.c:793
 #~ msgid "Beep on display alarms"
 #~ msgstr "Piep bij weergave alarm"
 
-# calendar/gui/prop.c:803

+# calendar/gui/prop.c:803
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Geluid alarm stopt na"
 
-# calendar/gui/prop.c:820

+# calendar/gui/prop.c:820
 #~ msgid "Enable snoozing for "
 #~ msgstr "Maak sluimeren mogelijk voor "
 
@@ -10439,18 +11083,18 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Bekijk bericht bronnen uit \"%s\""
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #~ msgid "Threading message list"
 #~ msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #~ msgid "Thread message list"
 #~ msgstr "Berichtenlijst weergeven met onderlinge relaties"
 
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

+# composer/e-msg-composer-address-dialog.glade.h:9
 #~ msgid "Quick Search"
 #~ msgstr "Snel Zoeken"
 
@@ -10481,10 +11125,6 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Custom search"
 #~ msgstr "Aangepast zoeken"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

-#~ msgid "Full Search"
-#~ msgstr "Volledige Zoekactie"
-
 #~ msgid ""
 #~ "Welcome to the Evolution Mail configuration wizard!\n"
 #~ "By filling in some information about your email\n"
@@ -10505,14 +11145,14 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Open in New Window"
 #~ msgstr "Open in Nieuw Venster"
 
-# mail/folder-browser-factory.c:37

+# mail/folder-browser-factory.c:37
 #~ msgid "Forward Message"
 #~ msgstr "Bericht Doorsturen"
 
 #~ msgid "Move Message"
 #~ msgstr "Bericht Verplaatsen"
 
-# composer/e-msg-composer.c:1127

+# composer/e-msg-composer.c:1127
 #~ msgid "Copy Message"
 #~ msgstr "Bericht Kopi�ren"
 
@@ -10528,59 +11168,59 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Error while communicating with address server"
 #~ msgstr "Fout bij communiceren met adres server"
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: _New Task"
 #~ msgstr "FIXME: _Nieuwe Taak"
 
-# calendar/gui/event-editor.c:1148

+# calendar/gui/event-editor.c:1148
 #~ msgid "FIXME: _Mark Complete"
 #~ msgstr "FIXME: _Markeer Volledig"
 
-# addressbook/contact-editor/e-contact-editor.c:648

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

+# addressbook/contact-editor/e-contact-editor.c:648
+# calendar/gui/event-editor.c:1123
 #~ msgid "FIXME: Assig_n Task"
 #~ msgstr "FIXME: Ken Taak Toe"
 
-# addressbook/contact-editor/e-contact-editor.c:862

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

+# addressbook/contact-editor/e-contact-editor.c:862
+# calendar/gui/event-editor.c:1343
 #~ msgid "FIXME: _Reply"
 #~ msgstr "FIXME: Beantwoorden"
 
-# mail/folder-browser-factory.c:35

+# mail/folder-browser-factory.c:35
 #~ msgid "FIXME: Reply to A_ll"
 #~ msgstr "FIXME: Iedereen beantwoorden"
 
-# calendar/gui/event-editor.c:1325

+# calendar/gui/event-editor.c:1325
 #~ msgid "FIXME: Print..."
 #~ msgstr "FIXME: Afdrukken"
 
-# addressbook/contact-editor/e-contact-editor.c:849

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

+# addressbook/contact-editor/e-contact-editor.c:849
+# calendar/gui/event-editor.c:1328
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Bestand als attachmente invoegen"
 
-# addressbook/contact-editor/e-contact-editor.c:761

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

+# addressbook/contact-editor/e-contact-editor.c:761
+# calendar/gui/event-editor.c:1238
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "FIXME: Ken Taak Toe..."
 
 #~ msgid "Assign the task to someone"
 #~ msgstr "Ken de taak aan iemand toe"
 
-# calendar/gui/event-editor.c:1215

+# calendar/gui/event-editor.c:1215
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ka_lender..."
 
-# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

+# calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #~ msgid "Save and close this appointment"
 #~ msgstr "Deze afspraak opslaan en sluiten"
 
-# calendar/gui/event-editor.c:1334

+# calendar/gui/event-editor.c:1334
 #~ msgid "Invite attendees to a meeting"
 #~ msgstr "Nodig gasten uit op een afspraak"
 
-# calendar/gui/gncal-todo.c:171

+# calendar/gui/gncal-todo.c:171
 #~ msgid "_Summary:"
 #~ msgstr "_Samenvatting:"
 
@@ -10593,33 +11233,33 @@ msgstr "De Evolution werkgroep suite"
 #~ "Uren\n"
 #~ "Dagen\n"
 
-# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

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

+# calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
+# calendar/gui/gncal-todo.c:717
 #~ msgid "Daily"
 #~ msgstr "Dagelijks"
 
-# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

+# calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
 #~ msgid "Weekly"
 #~ msgstr "Weekelijks"
 
-# calendar/gui/calendar-commands.c:531

+# calendar/gui/calendar-commands.c:531
 #~ msgid "Monthly"
 #~ msgstr "Maandelijks"
 
-# calendar/gui/calendar-commands.c:535

+# calendar/gui/calendar-commands.c:535
 #~ msgid "Yearly"
 #~ msgstr "Jaarlijks"
 
-# addressbook/printing/e-contact-print.glade.h:31

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

+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
 #~ msgid "label23"
 #~ msgstr "label23"
 
 #~ msgid "Every "
 #~ msgstr "Elke "
 
-# addressbook/printing/e-contact-print.glade.h:31

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

+# addressbook/printing/e-contact-print.glade.h:31
+# addressbook/printing/e-contact-print.glade.h:43
 #~ msgid "label24"
 #~ msgstr "label24"
 
@@ -10653,7 +11293,7 @@ msgstr "De Evolution werkgroep suite"
 #~ "Zaterdag\n"
 #~ "Zondag\n"
 
-# composer/e-msg-composer-address-dialog.glade.h:18

+# composer/e-msg-composer-address-dialog.glade.h:18
 #~ msgid "label27"
 #~ msgstr "label27"
 
@@ -10663,58 +11303,58 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Change"
 #~ msgstr "Veranderen"
 
-# composer/e-msg-composer-address-dialog.c:184

+# composer/e-msg-composer-address-dialog.c:184
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Knip het geselecteerde item naar het klembord"
 
-# composer/e-msg-composer-address-dialog.c:188

+# composer/e-msg-composer-address-dialog.c:188
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Kopieer het geselecteerde item naar het klembord"
 
-# composer/e-msg-composer-address-dialog.c:528

+# composer/e-msg-composer-address-dialog.c:528
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Selecteer de geadresseerden"
 
-# composer/e-msg-composer-address-dialog.glade.h:9

+# composer/e-msg-composer-address-dialog.glade.h:9
 #~ msgid "Search..."
 #~ msgstr "Zoeken..."
 
-# composer/e-msg-composer-address-dialog.glade.h:14

+# composer/e-msg-composer-address-dialog.glade.h:14
 #~ msgid "To: >>"
 #~ msgstr "Aan: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:15

+# composer/e-msg-composer-address-dialog.glade.h:15
 #~ msgid "Cc: >>"
 #~ msgstr "Cc: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:16

+# composer/e-msg-composer-address-dialog.glade.h:16
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-# composer/e-msg-composer-address-dialog.glade.h:17

+# composer/e-msg-composer-address-dialog.glade.h:17
 #~ msgid "label9"
 #~ msgstr "label9"
 
-# composer/e-msg-composer-address-dialog.glade.h:18

+# composer/e-msg-composer-address-dialog.glade.h:18
 #~ msgid "label7"
 #~ msgstr "label7"
 
-# composer/e-msg-composer-address-dialog.glade.h:19

+# composer/e-msg-composer-address-dialog.glade.h:19
 #~ msgid "label8"
 #~ msgstr "label8"
 
 #~ msgid "Load a previously saved message"
 #~ msgstr "Laad een eerder opgeslagen bericht"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
 #~ msgid "Send _Now"
 #~ msgstr "_Nu Versturen"
 
 #~ msgid "Quit the message composer"
 #~ msgstr "Sluit het bericht venster"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

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

+# addressbook/gui/component/ldap-server-dialog.glade.h:7
+# composer/e-msg-composer-attachment.glade.h:9
 #~ msgid "More criterion"
 #~ msgstr "Meer criteria:"
 
@@ -10727,51 +11367,51 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Could not read pilot's DateBook application block"
 #~ msgstr "Kon het 'Datebook' applicatie blok niet uit de pilot lezen"
 
-# calendar/gui/calendar-commands.c:175

+# calendar/gui/calendar-commands.c:175
 #~ msgid "Gnome Calendar"
 #~ msgstr "Gnome Kalender"
 
-# calendar/gui/calendar-commands.c:178

+# calendar/gui/calendar-commands.c:178
 #~ msgid "The GNOME personal calendar and schedule manager."
 #~ msgstr "Het GNOME persoonlijke kalender en rooster beheer."
 
-# calendar/gui/calendar-commands.c:535

+# calendar/gui/calendar-commands.c:535
 #~ msgid "Year"
 #~ msgstr "Jaar"
 
-# calendar/gui/calendar-commands.c:535

+# calendar/gui/calendar-commands.c:535
 #~ msgid "Show 1 year"
 #~ msgstr "Toon 1 jaar"
 
-# calendar/gui/calendar-commands.c:746

+# calendar/gui/calendar-commands.c:746
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
-# calendar/gui/calendar-commands.c:746

+# calendar/gui/calendar-commands.c:746
 #~ msgid "'s calendar"
 #~ msgstr "'s zijn kalender"
 
-# calendar/gui/event-editor.c:1148

+# calendar/gui/event-editor.c:1148
 #~ msgid "FIXME: _Delete"
 #~ msgstr "FIXME: Verwij_deren"
 
-# calendar/gui/event-editor.c:1320

+# calendar/gui/event-editor.c:1320
 #~ msgid "FIXME: Save and Close"
 #~ msgstr "FIXME: Opslaan en sluiten"
 
-# calendar/gui/event-editor.c:1330

+# calendar/gui/event-editor.c:1330
 #~ msgid "FIXME: Recurrence..."
 #~ msgstr "FIXME: Herhaling..."
 
-# calendar/gui/event-editor.c:1331

+# calendar/gui/event-editor.c:1331
 #~ msgid "Configure recurrence rules"
 #~ msgstr "Configureer herhalings regels"
 
-# calendar/gui/event-editor.c:1336

+# calendar/gui/event-editor.c:1336
 #~ msgid "FIXME: Delete"
 #~ msgstr "FIXME: Verwijderen"
 
-# composer/e-msg-composer-hdrs.c:234

+# composer/e-msg-composer-hdrs.c:234
 #~ msgid "S_ubject:"
 #~ msgstr "Onderwerp:"
 
@@ -10795,85 +11435,85 @@ msgstr "De Evolution werkgroep suite"
 #~ "Normaal\n"
 #~ "Laag\n"
 
-# addressbook/printing/e-contact-print.glade.h:35

+# addressbook/printing/e-contact-print.glade.h:35
 #~ msgid "Resources:"
 #~ msgstr "Bronnen:"
 
-# mail/message-list.c:502

+# mail/message-list.c:502
 #~ msgid "Due date"
 #~ msgstr "Verloop Datum"
 
-# addressbook/contact-editor/e-contact-editor.c:671

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

+# addressbook/contact-editor/e-contact-editor.c:671
+# calendar/gui/event-editor.c:1146
 #~ msgid "FIXME: Invite _Attendees..."
 #~ msgstr "FIXME: Nodig _Gasten Uit..."
 
-# calendar/gui/event-editor.c:1263

+# calendar/gui/event-editor.c:1263
 #~ msgid "FIXME: C_ancel Invitation..."
 #~ msgstr "FIXME: _Annuleer Uitnodiging..."
 
-# calendar/gui/gncal-todo.c:428

+# calendar/gui/gncal-todo.c:428
 #~ msgid "Time Left"
 #~ msgstr "Resterende tijd"
 
-# calendar/gui/gncal-todo.c:440

+# calendar/gui/gncal-todo.c:440
 #~ msgid "To-do list"
 #~ msgstr "To-Do lijst"
 
-# calendar/gui/gncal-todo.c:488

+# calendar/gui/gncal-todo.c:488
 #~ msgid "Edit..."
 #~ msgstr "Bewerken..."
 
-# calendar/gui/gncal-todo.c:712

+# calendar/gui/gncal-todo.c:712
 #~ msgid "Weeks"
 #~ msgstr "Weken"
 
-# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
 #~ msgid "Hour"
 #~ msgstr "Uur"
 
-# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

+# calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
 #~ msgid "Minute"
 #~ msgstr "Minuut"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #~ msgid "Seconds"
 #~ msgstr "Seconden"
 
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
 #~ msgid "Second"
 #~ msgstr "Seconde"
 
-# calendar/gui/print.c:868

+# calendar/gui/print.c:868
 #~ msgid "TODO Items"
 #~ msgstr "TODO Items"
 
-# calendar/gui/print.c:1000 calendar/gui/print.c:1014

-# calendar/gui/print.c:1015

+# calendar/gui/print.c:1000 calendar/gui/print.c:1014
+# calendar/gui/print.c:1015
 #~ msgid "%a"
 #~ msgstr "%a"
 
-# calendar/gui/print.c:1001 calendar/gui/print.c:1002

-# calendar/gui/print.c:1016 calendar/gui/print.c:1017

+# calendar/gui/print.c:1001 calendar/gui/print.c:1002
+# calendar/gui/print.c:1016 calendar/gui/print.c:1017
 #~ msgid "%b"
 #~ msgstr "%b"
 
-# calendar/gui/print.c:1021

+# calendar/gui/print.c:1021
 #~ msgid "Current week (%s %s %d - %s %s %d %d)"
 #~ msgstr "Current week (%s %s %d - %s %s %d %d)"
 
-# calendar/gui/print.c:1027

+# calendar/gui/print.c:1027
 #~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
 #~ msgstr "Current week (%s %s %d %d - %s %s %d %d)"
 
-# addressbook/printing/e-contact-print.glade.h:28

+# addressbook/printing/e-contact-print.glade.h:28
 #~ msgid "_Format"
 #~ msgstr "_Formaat"
 
 #~ msgid "Less"
 #~ msgstr "Minder"
 
-# mail/folder-browser-factory.c:29

+# mail/folder-browser-factory.c:29
 #~ msgid "Check for new mail"
 #~ msgstr "Controleer op nieuwe mail"
 
@@ -10907,27 +11547,23 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "Het %s component ondersteund geen PersistStream!\n"
 
-# composer/e-msg-composer.c:894

+# composer/e-msg-composer.c:894
 #~ msgid "Open Mime Message"
 #~ msgstr "Open Mime Bericht"
 
-# widgets/e-table/e-table-config.glade.h:7

-#~ msgid "Fields"
-#~ msgstr "Velden"
-
-# widgets/e-table/e-table-config.glade.h:8

+# widgets/e-table/e-table-config.glade.h:8
 #~ msgid "Grouping"
 #~ msgstr "Groeperen"
 
-# widgets/e-table/e-table-config.glade.h:10

+# widgets/e-table/e-table-config.glade.h:10
 #~ msgid "Filter"
 #~ msgstr "Filter"
 
-# widgets/e-table/e-table-field-chooser.glade.h:7

+# widgets/e-table/e-table-field-chooser.glade.h:7
 #~ msgid "Field Chooser"
 #~ msgstr "Veld Kiezer"
 
-# widgets/e-table/e-table-field-chooser.glade.h:8

+# widgets/e-table/e-table-field-chooser.glade.h:8
 #~ msgid ""
 #~ "To add a column to your table, drag it into\n"
 #~ "the location in which you want it to appear."
@@ -10935,27 +11571,27 @@ msgstr "De Evolution werkgroep suite"
 #~ "Om een kolom toe te voegen in de tabel, moet je\n"
 #~ "het slepen naar de plaats waar je de kolum wilt."
 
-# widgets/e-table/e-table-group.glade.h:7

+# widgets/e-table/e-table-group.glade.h:7
 #~ msgid "window1"
 #~ msgstr "window1"
 
-# widgets/e-table/e-table-group.glade.h:8

+# widgets/e-table/e-table-group.glade.h:8
 #~ msgid "Available fields"
 #~ msgstr "Beschikbare velden"
 
-# widgets/e-table/e-table-group.glade.h:10

+# widgets/e-table/e-table-group.glade.h:10
 #~ msgid "Show in this order"
 #~ msgstr "Toon in deze volgorde"
 
-# widgets/e-table/e-table-group.glade.h:11

+# widgets/e-table/e-table-group.glade.h:11
 #~ msgid "label2"
 #~ msgstr "label2"
 
-# widgets/e-table/e-table-group.glade.h:12

+# widgets/e-table/e-table-group.glade.h:12
 #~ msgid "Add >>"
 #~ msgstr "Toevoegen >>"
 
-# widgets/e-table/e-table-group.glade.h:13

+# widgets/e-table/e-table-group.glade.h:13
 #~ msgid "<< Remove"
 #~ msgstr "<< Verwijderen"
 
@@ -10965,19 +11601,19 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Sort Descending"
 #~ msgstr "Sorteer Aflopend"
 
-# addressbook/contact-editor/e-contact-editor.c:805

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

+# addressbook/contact-editor/e-contact-editor.c:805
+# calendar/gui/event-editor.c:1279
 #~ msgid "Unsort"
 #~ msgstr "Sortering Opheffen"
 
 #~ msgid "Group By This Field"
 #~ msgstr "Groeperen Op Dit Veld"
 
-# widgets/shortcut-bar/e-group-bar.c:632

+# widgets/shortcut-bar/e-group-bar.c:632
 #~ msgid "Group By Box"
 #~ msgstr "Grouperen Per Vak"
 
-# calendar/gui/calendar-commands.c:59

+# calendar/gui/calendar-commands.c:59
 #~ msgid "Alignment"
 #~ msgstr "Uitlijning:"
 
@@ -10987,42 +11623,35 @@ msgstr "De Evolution werkgroep suite"
 #~ msgid "Format Columns..."
 #~ msgstr "Kolom Opmaak..."
 
-#~ msgid "Customize Current View..."
-#~ msgstr "Huidige Weergave Aanpassen..."
-
-# calendar/gui/calendar-commands.c:687

+# calendar/gui/calendar-commands.c:687
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nieuwe afspraak voor vandaag..."
 
-# calendar/gui/calendar-commands.c:688

+# calendar/gui/calendar-commands.c:688
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Maak een nieuwe afspraak voor vandaag"
 
-# composer/e-msg-composer.c:945

+# composer/e-msg-composer.c:945
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Knip het geselecteerde gebied naar het klembord"
 
-# composer/e-msg-composer.c:946

+# composer/e-msg-composer.c:946
 #~ msgid "Copy selected region into the clipboard"
 #~ msgstr "Kopieer het geselecteerde gebied naar het klembord"
 
-# composer/e-msg-composer.c:947

+# composer/e-msg-composer.c:947
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Plak het geselecteerde gebied vanuit het klembord"
 
-# filter/filter-editor.c:209

 #~ msgid "Back"
 #~ msgstr "Terug"
 
-# filter/filter-editor.c:211

 #~ msgid "Finish"
 #~ msgstr "Afmaken"
 
-# filter/filter-editor.c:216

 #~ msgid "Apply"
 #~ msgstr "Toepassen"
 
-# filter/filter-editor.c:233

 #~ msgid ""
 #~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 #~ "continue forwards to customise it.</p>"
@@ -11030,31 +11659,31 @@ msgstr "De Evolution werkgroep suite"
 #~ "<h2>Cre-eer Filter Regel</h2><p>Selecteer een van de basis-regels hierboven, "
 #~ "en ga dan door om hem aan te passen.</p>"
 
-# mail/folder-browser-factory.c:83

+# mail/folder-browser-factory.c:83
 #~ msgid "_Filter Druid ..."
 #~ msgstr "_Filter Wizard..."
 
-# mail/mail-config.c:777 mail/mail-config.c:853

+# mail/mail-config.c:777 mail/mail-config.c:853
 #~ msgid "Test these values before continuing"
 #~ msgstr "Controleer deze waarden voordat je doorgaat"
 
-# mail/mail-config.c:978

+# mail/mail-config.c:978
 #~ msgid "Select the method you would like to use to deliver your mail."
 #~ msgstr "Selecteer de methode die je wil gebruiken om de mail te bezorgen."
 
-# mail/mail-config.c:1600

+# mail/mail-config.c:1600
 #~ msgid "Enter the hostname of the News Server you have."
 #~ msgstr "Geef de hostname van uw News Server."
 
-# mail/mail-threads.c:483

+# mail/mail-threads.c:483
 #~ msgid "Currently pending operations:"
 #~ msgstr "Opdrachten die nog uitgevoerd moeten worden:"
 
-# shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379

+# shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
 #~ msgid "Composes a new mail message"
 #~ msgstr "Stelt een nieuw bericht op"
 
-# shell/main.c:214

+# shell/main.c:214
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Kan het configuratie-systeem niet initialiseren."
 
diff --git a/po/nn.po b/po/nn.po
index 018702a5db..8fb70e1376 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,398 +2,220 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: 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
+#: addressbook/backend/ebook/e-card.c:3053
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 #, fuzzy
 msgid ""
 "\n"
@@ -410,140 +232,38 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synkronis�r"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopi�r fra pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopi�r til pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Flett fra pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Flett til pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-#, fuzzy
-msgid "Original Author:"
-msgstr "Opprinneleg forfattar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-#, fuzzy
-msgid "Evolution Addressbook Conduit"
-msgstr "Gpilotd adressekomponent"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-#, fuzzy
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Oppsettfil lasta på nytt."
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-#, fuzzy
-msgid "Synchronize Action"
-msgstr "Synkroniser"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-#, fuzzy
-msgid "Conduit state"
-msgstr "&Lenkjer"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-#, fuzzy
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Kan ikkje kopla til daemon"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-#, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr "Feil under opning av dette dokumentet"
+#: 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:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikkje initiere Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -553,388 +273,497 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-#, fuzzy
-msgid "_Add"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
 msgstr "Legg til"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
+#: addressbook/contact-editor/contact-editor.glade.h:2
 #, fuzzy
-msgid "_Delete"
-msgstr "Slett"
+msgid "Anni_versary:"
+msgstr "Merkedag"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
+#: addressbook/contact-editor/contact-editor.glade.h:3
 #, fuzzy
-msgid "Phone Types"
-msgstr "Kjende typar"
+msgid "B_usiness"
+msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
+#: addressbook/contact-editor/contact-editor.glade.h:4
 #, fuzzy
-msgid "New phone type"
-msgstr "&Ny type"
+msgid "Business _Fax"
+msgstr "Firma-fax"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Legg til"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "&Innhald ..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+#, fuzzy
+msgid "Ca_tegories..."
+msgstr "Kategoriar ..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-#, fuzzy
-msgid "_Full Name..."
-msgstr "Fullt namn"
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Detaljar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File As:"
 msgstr "Arkiver som"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "Generelt"
+
+#: addressbook/contact-editor/contact-editor.glade.h:11
 #, fuzzy
-msgid "Web page address:"
-msgstr "&WINS-adresse:"
+msgid "New phone type"
+msgstr "&Ny type"
+
+#: addressbook/contact-editor/contact-editor.glade.h:12
+#, fuzzy
+msgid "No_tes:"
+msgstr "Notat:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
+#: addressbook/contact-editor/contact-editor.glade.h:13
+#, fuzzy
+msgid "Phone Types"
+msgstr "Kjende typar"
+
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
+#, fuzzy
+msgid "Primary Email"
+msgstr "Primær&oppsett"
+
+#: addressbook/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
+#: addressbook/contact-editor/contact-editor.glade.h:16
 #, fuzzy
-msgid "_Business"
-msgstr "Firma"
+msgid "Web page address:"
+msgstr "&WINS-adresse:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 #, fuzzy
-msgid "_Home"
-msgstr "Heim"
+msgid "_Add"
+msgstr "Legg til"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/contact-editor.glade.h:18
 #, fuzzy
-msgid "Business _Fax"
-msgstr "Firma-fax"
+msgid "_Address..."
+msgstr "Adresse"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/contact-editor.glade.h:19
 #, fuzzy
-msgid "_Mobile"
-msgstr "Mobil:"
+msgid "_Assistant's name:"
+msgstr "&Namn på assistent:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:20
 #, fuzzy
-msgid "Primary Email"
-msgstr "Primær&oppsett"
+msgid "_Birthday:"
+msgstr "Fødselsdag:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/contact-editor/contact-editor.glade.h:21
 #, fuzzy
-msgid "B_usiness"
+msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/contact-editor.glade.h:22
 #, fuzzy
-msgid "_This is the mailing address"
-msgstr "Rediger e-post-adresser"
+msgid "_Company:"
+msgstr "Firma:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 #, fuzzy
-msgid "C_ontacts..."
-msgstr "&Innhald ..."
+msgid "_Delete"
+msgstr "Slett"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/contact-editor.glade.h:24
 #, fuzzy
-msgid "Ca_tegories..."
-msgstr "Kategoriar ..."
+msgid "_Department:"
+msgstr "Avdeling:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: addressbook/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Full Name..."
+msgstr "Fullt namn"
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "_Home"
+msgstr "Heim"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:28
 #, fuzzy
-msgid "_Company:"
-msgstr "Firma:"
+msgid "_Manager's Name:"
+msgstr "Namn på sjef"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/contact-editor.glade.h:29
 #, fuzzy
-msgid "_Address..."
-msgstr "Adresse"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Generelt"
+msgid "_Mobile"
+msgstr "Mobil:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:30
 #, fuzzy
-msgid "_Department:"
-msgstr "Avdeling:"
+msgid "_Nickname:"
+msgstr "Kallenamn:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-#, fuzzy
-msgid "_Nickname:"
-msgstr "Kallenamn:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-#, fuzzy
-msgid "_Birthday:"
-msgstr "Fødselsdag:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-#, fuzzy
-msgid "_Assistant's name:"
-msgstr "&Namn på assistent:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
+#: addressbook/contact-editor/contact-editor.glade.h:34
 #, fuzzy
-msgid "_Manager's Name:"
-msgstr "Namn på sjef"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-#, fuzzy
-msgid "Anni_versary:"
-msgstr "Merkedag"
+msgid "_This is the mailing address"
+msgstr "Rediger e-post-adresser"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "No_tes:"
-msgstr "Notat:"
+msgid "Delete Contact?"
+msgstr "Slett kolonne"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detaljar"
+#: addressbook/contact-editor/e-contact-editor.c:590
+msgid "This contact belongs to these categories:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 #, 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
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 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
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Rediger fil"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Fullt namn"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-post 2"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+msgid "Address _2:"
+msgstr "Adresse"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Canada"
+msgstr "Skriv ut alle"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Check Address"
+msgstr "Alternativ adresse"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+#, fuzzy
+msgid "Countr_y:"
+msgstr "Land:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+#, fuzzy
+msgid "Finland"
+msgstr "Finn ..."
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+#, fuzzy
+msgid "_Address:"
+msgstr "Adresse"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "Stad:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "_PO Box:"
+msgstr "Postboks"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+#, fuzzy
+msgid "_State/Province:"
+msgstr "Stat/provins"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "_ZIP Code:"
+msgstr "ZIP/Postnummer"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 #, fuzzy
 msgid "Check Full Name"
 msgstr "Fullt namn"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:4
 #, fuzzy
-msgid "_First:"
-msgstr "Førenamn"
+msgid "I"
+msgstr "I"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
 #, fuzzy
-msgid "_Title:"
-msgstr "Tittel:"
+msgid "Miss"
+msgstr "er"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:13
 #, fuzzy
-msgid "_Middle:"
-msgstr "Midt på:"
+msgid "_First:"
+msgstr "Førenamn"
 
-#: addressbook/contact-editor/fullname-strings.h:26
+#: addressbook/contact-editor/fullname.glade.h:14
 #, fuzzy
 msgid "_Last:"
 msgstr "Etternamn"
 
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:15
+#, fuzzy
+msgid "_Middle:"
+msgstr "Midt på:"
+
+#: addressbook/contact-editor/fullname.glade.h:16
 #, fuzzy
 msgid "_Suffix:"
 msgstr "Etterstaving"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+#, fuzzy
+msgid "_Title:"
+msgstr "Tittel:"
+
+#: addressbook/gui/component/addressbook.c:237
 #, fuzzy
 msgid "As _Minicards"
 msgstr "Bruk jokerteikn"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 #, fuzzy
 msgid "As _Table"
 msgstr "Tabell"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -946,29 +775,29 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 #, fuzzy
 msgid "Email contains"
 msgstr "Små ikon"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -977,203 +806,491 @@ msgstr ""
 msgid "Other Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Tenar:"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "Fil"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 #, fuzzy
 msgid "Base"
 msgstr "Lim inn"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 #, fuzzy
 msgid "Subtree"
 msgstr "Kjelder"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "time/timar"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Prioritet:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Root DN:"
 msgstr "Rot"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Søk"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Sti:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "Fila finst ikkje\n"
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Navn:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Kjelde:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Rediger"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+msgid "Name"
+msgstr "Namn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Slett kolonne"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Oppsettfil lasta på nytt."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Gpilotd adressekomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Øydelagd oppsettfil."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Øydelagd oppsettfil."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Legg adresse til adresseboka"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Gpilotd adressekomponent"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Finn ..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Message Recipients"
+msgstr "Melding motteken"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select Names"
+msgstr "Merk område"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "Vel ei gruppe først."
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Søk"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+#, fuzzy
+msgid "b"
+msgstr "av"
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+#, fuzzy
+msgid "c"
+msgstr "cm"
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+#, fuzzy
+msgid "d"
+msgstr "Id"
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+#, fuzzy
+msgid "e"
+msgstr "Ons"
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+#, fuzzy
+msgid "f"
+msgstr "I"
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+#, fuzzy
+msgid "g"
+msgstr "gs"
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+#, fuzzy
+msgid "h"
+msgstr "4."
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+#, fuzzy
+msgid "i"
+msgstr "er"
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+#, fuzzy
+msgid "k"
+msgstr "Ok"
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+#, fuzzy
+msgid "m"
+msgstr "ms"
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+#, fuzzy
+msgid "n"
+msgstr "På"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+#, fuzzy
+msgid "o"
+msgstr "Nei"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+#, fuzzy
+msgid "r"
+msgstr "Dr"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr "s"
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+#, fuzzy
+msgid "t"
+msgstr "Qt"
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+#, fuzzy
+msgid "u"
+msgstr "Sum"
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+#, fuzzy
+msgid "x"
+msgstr "Tx"
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+#, fuzzy
+msgid "y"
+msgstr "av"
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+#, fuzzy
+msgid "z"
+msgstr "Hz"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 #, fuzzy
 msgid "Manager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "Trykk her for å leggja til ein ny virtuell vert."
+
 #: addressbook/gui/widgets/e-minicard-control.c:280
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1182,142 +1299,340 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
 #, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Tilgjengelege lenkjer:"
+msgid "Card View"
+msgstr "Teikn"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Kropp"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Botn:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
 #, fuzzy
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Øydelagd oppsettfil."
+msgid "Dimensions:"
+msgstr "Dimensjonar"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Skrifttype ..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Skrifttypar"
+
+#: addressbook/printing/e-contact-print.glade.h:9
 #, fuzzy
-msgid "Error while communicating with calendar server"
-msgstr "Feil ved tilkopling til tenar."
+msgid "Footer:"
+msgstr "Botntekst"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Format"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Dekl."
+
+#: addressbook/printing/e-contact-print.glade.h:12
 #, fuzzy
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+msgid "Header/Footer"
+msgstr "&Topp-/botntekst ..."
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
+#: addressbook/printing/e-contact-print.glade.h:13
+#, fuzzy
+msgid "Headings"
+msgstr "Les"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
+#: addressbook/printing/e-contact-print.glade.h:14
+#, fuzzy
+msgid "Headings for each letter"
+msgstr "Les mapper"
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Høgd:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
 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 "
+#: addressbook/printing/e-contact-print.glade.h:17
+#, fuzzy
+msgid "Include:"
+msgstr "Inkluder fil"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Liggjande"
+
+#: 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 ""
 
-#: calendar/gui/alarm-notify.c:876
+#: addressbook/printing/e-contact-print.glade.h:21
 #, fuzzy
-msgid "Snooze"
-msgstr "Spooler"
+msgid "Margins"
+msgstr "&Marg"
 
-#. 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"
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+#, fuzzy
+msgid "Number of columns:"
+msgstr "Tal på kolonnar:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Val"
 
-#: calendar/gui/calendar-commands.c:245
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Retning"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Side"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Speloppsett"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Papir"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Paper source:"
+msgstr "Papir&storleik:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Ståande"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Førehandsvising:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+#, fuzzy
+msgid "Print using gray shading"
+msgstr "Skriv med grånyansar"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+#, fuzzy
+msgid "Reverse on even pages"
+msgstr "Merk partal-sider"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Høgre:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Sections:"
+msgstr "Del:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Shading"
+msgstr "Lagring"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr "Storleik:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+#, fuzzy
+msgid "Start on a new page"
+msgstr "Startar nytt spel ..."
+
+#: addressbook/printing/e-contact-print.glade.h:38
+#, fuzzy
+msgid "Style name:"
+msgstr "Typenamn:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Topp:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Type:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Breidd:"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+#, fuzzy
+msgid "Error while communicating with calendar server"
+msgstr "Feil ved tilkopling til tenar."
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+#, fuzzy
+msgid "Could not read pilot's Calendar application block"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Fann ikkje fil"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 #, fuzzy
 msgid "Open calendar"
 msgstr "Feil ved opning"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 #, fuzzy
 msgid "Save calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 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: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"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: 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:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+#, fuzzy
+msgid "High"
+msgstr "Høgd"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+#, fuzzy
+msgid "Low"
+msgstr "Senk"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+#, fuzzy
+msgid "Not Started"
+msgstr "Starta"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+#, fuzzy
+msgid "In Progress"
+msgstr "Framgong:"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Ferdig"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "Avbroten."
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:805
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1325,98 +1640,152 @@ msgid ""
 "%s"
 msgstr "Ein bandindeks må vera valt i treet."
 
-#. strptime format for a date.
-#: 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"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Ingen"
+
+#: calendar/gui/calendar-model.c:973
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 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:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:1013
+msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 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:900
-msgid "%I:%M %p%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
 #, fuzzy
-msgid "%H:%M%n"
-msgstr "%H:%M"
+msgid "Recurring"
+msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-model.c:1600
+msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
+#: calendar/gui/calendar-model.c:1606
 #, fuzzy
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Prioriteten må vera i området 1-99"
+msgid "No"
+msgstr "&No"
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-summary.c:196
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 #, fuzzy
 msgid "%I:%M%p"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 #, fuzzy
 msgid "Display"
 msgstr "Vis"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "Avtale"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "Vedlegg"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#, fuzzy
+msgid "Snooze"
+msgstr "Spooler"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
@@ -1430,244 +1799,893 @@ msgstr ""
 msgid "No summary available."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "Lukk"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Edit appointment"
+msgstr "&Endra avtale ..."
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+#, fuzzy
+msgid "Snooze time (minutes)"
+msgstr "Låg grense (minutt):"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "05 minutes"
+msgstr "minutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#, fuzzy
+msgid "10 minutes"
+msgstr "minutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#, fuzzy
+msgid "15 minutes"
+msgstr "minutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#, fuzzy
+msgid "24 hour"
+msgstr "time/timar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "30 minutes"
+msgstr "minutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "60 minutes"
+msgstr "minutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "Audio Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Calendar"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "Innstillingar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Fargar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr "Standard"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Display options"
+msgstr "Vis"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr "Forfallsdato"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "End of day:"
+msgstr "Slutt trekk"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "Fre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+#, fuzzy
+msgid "Friday"
+msgstr "Fredag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Highlight"
+msgstr "Opplysing:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#, fuzzy
+msgid "Items Due Today"
+msgstr "&Opplys syntaks"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Items Due Today:"
+msgstr "&Opplys syntaks"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "Mån"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Måndag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Overdue Items"
+msgstr "&Syntaksmerkingsmodusar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#, fuzzy
+msgid "Overdue Items:"
+msgstr "&Syntaksmerkingsmodusar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "&Slett avtale"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Reminders"
+msgstr "Påminning:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "Lau"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+#, fuzzy
+msgid "Saturday"
+msgstr "Laurdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Avtale"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Show week numbers"
+msgstr "Vis %1"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "Start of day:"
+msgstr "Start-dato"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Sun"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Sundag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "Oppgåve"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "Tor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+#, fuzzy
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Time Until Due"
+msgstr "Tid og dato"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "Time divisions:"
+msgstr "Dimensjonar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#, fuzzy
+msgid "Time format:"
+msgstr "Tidsformat:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Tys"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+#, fuzzy
+msgid "Tuesday"
+msgstr "Tysdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#, fuzzy
+msgid "Visual Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "Ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+#, fuzzy
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#, fuzzy
+msgid "Work week"
+msgstr "Veke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "seconds."
+msgstr "sekund"
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, 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:66
+#: calendar/gui/dialogs/delete-comp.c:71
 #, 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:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, 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:75
+#: calendar/gui/dialogs/delete-comp.c:80
 #, 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:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, 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:84
+#: calendar/gui/dialogs/delete-comp.c:89
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "I ferd med å senda e-post ..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, fuzzy, no-c-format
+msgid "% Comp_lete:"
+msgstr "Ferdig"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+#, fuzzy
+msgid "Classification"
+msgstr "&Forstørring"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "Dato"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date Completed:"
+msgstr "Ferdig"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Privat"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "Framgong:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Praksis"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Start-dato:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Samandrag:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Oppgåve"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Confidential"
+msgstr "Eksponentiell"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+#, fuzzy
+msgid "_Contacts..."
+msgstr "&Innhald ..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#, fuzzy
+msgid "_Due Date:"
+msgstr "Forfallsdato:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioritet:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Rediger oppgåve"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppgåver"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-#, fuzzy
-msgid "Do you want to save changes?"
-msgstr "I ferd med å senda e-post ..."
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
 msgid "Categories"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-calendar-table.c:155
-#, fuzzy
-msgid "Classification"
-msgstr "&Forstørring"
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Fullføring"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "End Date"
 msgstr "Slutt-dato"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "Start Date"
 msgstr "Start-dato:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Forfallsdato"
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 #, fuzzy
 msgid "Geographical Position"
 msgstr "Etikettplassering"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent complete"
 msgstr "Prosentformat"
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Transparency"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Opna ..."
-
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:169
 #, fuzzy
-msgid "Open the task"
-msgstr "Opna med %1"
+msgid "Click here to add a task"
+msgstr "Trykk her for å leggja til ein ny virtuell vert."
+
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:550
 #, fuzzy
 msgid "Mark Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 #, fuzzy
 msgid "Mark the task complete"
 msgstr "Marker alle som l&esne"
 
-#: 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:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "&Endra avtale ..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Rediger oppgåve"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Slett denne adressa"
+
+#: calendar/gui/e-calendar-table.c:560
 #, fuzzy
 msgid "Delete the task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: 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
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
 #, fuzzy
-msgid "New appointment..."
+msgid "New Appointment..."
 msgstr "&Vis avtale ..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Edit this appointment..."
-msgstr "&Endra avtale ..."
+msgid "Open"
+msgstr "Opna ..."
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
 #, fuzzy
-msgid "Delete this appointment"
+msgid "Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
 #, fuzzy
-msgid "Make this appointment movable"
+msgid "Schedule Meeting"
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
 #, fuzzy
-msgid "Delete this occurrence"
+msgid "Delete this Occurrence"
 msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
+#: calendar/gui/e-day-view.c:3047
 #, fuzzy
-msgid "Delete all occurrences"
+msgid "Delete all Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-itip-control.c:153
+#, fuzzy
+msgid "I couldn't update your calendar file!\n"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Alle filer vart sletta."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+#, fuzzy
+msgid "I couldn't read your calendar file!\n"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+#, fuzzy
+msgid "I couldn't update your calendar store."
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Alle filer vart sletta."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "Nullstill"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Slett"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Mellombels"
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "Feil ved opning"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Forfallsdato"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisasjon:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+#, fuzzy
+msgid "Sender"
+msgstr "Send"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Samandrag:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+#, fuzzy
+msgid "date-start"
+msgstr " start"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+#, fuzzy
+msgid "Attendee"
+msgstr "Kontaktar"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Gateadresse"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+#, fuzzy
+msgid "Attendees: "
+msgstr "Kontaktar"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Teikn"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "&Helsingstekst:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Organisasjon:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+#, fuzzy
+msgid ""
+"Request\n"
+"Meeting"
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "Mobil:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+#, fuzzy
+msgid ""
+"Schedule\n"
+"Time"
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 #, fuzzy
 msgid "Category:"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
@@ -1680,79 +2698,326 @@ msgstr "Metoden %1 er ikkje støtta."
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/event-editor.c:331
+#: calendar/gui/e-week-view.c:3255
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "&Endra avtale ..."
+msgid "Delete All Occurrences"
+msgstr "Slettar klassen"
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:3
 #, fuzzy
-msgid "on"
-msgstr "Mån"
+msgid "Appointment"
+msgstr "Avtale"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dagen"
+#: calendar/gui/event-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Avtale"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:7
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Repetering"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Every"
+msgstr "kvar"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Unntak"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+#, fuzzy
+msgid "Modify"
 msgstr "Måndag"
 
-#: calendar/gui/event-editor.c:436
+#: calendar/gui/event-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Tuesday"
-msgstr "Tysdag"
+msgid "No recurrence"
+msgstr "Repetering"
 
-#: calendar/gui/event-editor.c:437
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
 #, fuzzy
-msgid "Wednesday"
-msgstr "Onsdag"
+msgid "Preview"
+msgstr "Førehandsvising:"
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr "Repetering"
 
-#: calendar/gui/event-editor.c:438
+#: calendar/gui/event-editor-dialog.glade.h:19
 #, fuzzy
-msgid "Thursday"
-msgstr "Torsdag"
+msgid "Recurrence Rule"
+msgstr "Regel for repetering"
 
-#: calendar/gui/event-editor.c:439
+#: calendar/gui/event-editor-dialog.glade.h:20
 #, fuzzy
-msgid "Friday"
-msgstr "Fredag"
+msgid "Reminder"
+msgstr "Påminning:"
 
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
 #, fuzzy
-msgid "Saturday"
-msgstr "Laurdag"
+msgid "Run a program"
+msgstr "Terminalprogram:"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Sundag"
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "Hentar data frå %1"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "Skriftinnstillingar"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "Vis dato"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+#, fuzzy
+msgid "Simple recurrence"
+msgstr "Repetering"
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "Slutt-tid:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+#, fuzzy
+msgid "_Start time:"
+msgstr "Start-tid:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+#, fuzzy
+msgid "_Starting date:"
+msgstr "Start-dato"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Slutt etter"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "dag(ar)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "for"
+msgstr "Munnar"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "forever"
+msgstr "Repeterer for alltid"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "time/timar"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutt"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "månad(er)"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "&Endra avtale ..."
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "until"
+msgstr "utan tittel"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+#, fuzzy
+msgid "week(s)"
+msgstr "veke(r) på:"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "år"
+
+#: calendar/gui/event-editor.c:371
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "&Endra avtale ..."
+
+#: calendar/gui/event-editor.c:449
+#, fuzzy
+msgid "on"
+msgstr "Mån"
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "dagen"
+
+#: calendar/gui/event-editor.c:601
 #, fuzzy
 msgid "on the"
 msgstr "Månad"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr " dag"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "Vis dato"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "Veke"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "Vis %1"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "time/timar"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "time/timar"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "minutt"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "minutt"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr "sekund"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr "sekund"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Tilgjengelege lenkjer:"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/gnome-cal.c:695
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -1760,244 +3025,282 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:706
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#. 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:1
+#, fuzzy
+msgid "April"
+msgstr "April"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mån"
+#: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
+msgid "August"
+msgstr "August"
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tys"
+#: calendar/gui/goto-dialog.glade.h:3
+#, fuzzy
+msgid "December"
+msgstr "Desember"
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
+#: calendar/gui/goto-dialog.glade.h:4
+#, fuzzy
+msgid "February"
+msgstr "Februar"
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "Gå til side"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Gå til &i dag"
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lau"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "January"
+msgstr "Januar"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikkje initiere Bonobo"
+msgid "July"
+msgstr "Juli"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "June"
+msgstr "Juni"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "March"
+msgstr "Mars"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "May"
+msgstr "Måndag"
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "November"
+msgstr "November"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "October"
+msgstr "Oktober"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "September"
+msgstr "September"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Su"
 msgstr "Sum"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 #, fuzzy
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Oppgåver"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "Denne månaden"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 #, fuzzy
 msgid "Current year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Førehandsvising ..."
@@ -2007,10 +3310,90 @@ msgstr "&Førehandsvising ..."
 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
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -2095,79 +3478,196 @@ msgstr ""
 msgid "(Unknown error)"
 msgstr "Ukjend feil"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, fuzzy, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:181
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 #, 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
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Feil ved opning"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autentisering:"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr "Les filinformasjon"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr "Les filinformasjon"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-search-private.c:105
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:417
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2176,31 +3676,32 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Oppgåve"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr ""
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Vidaresendt melding"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, fuzzy, c-format
@@ -2212,7 +3713,7 @@ msgstr "Slett e-post frå tenaren"
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2230,13 +3731,18 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Leitar etter tilleggsmodular"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2248,25 +3754,40 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
-msgid "This option will connect to the IMAP server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Secure IMAPv4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:263
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:415
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Autentisering:"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2274,7 +3795,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2306,42 +3827,34 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -2349,7 +3862,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
@@ -2357,7 +3870,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -2394,8 +3907,8 @@ msgstr "Vidaresendt melding"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -2405,34 +3918,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, fuzzy, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 msgid "not a maildir directory"
 msgstr ""
 
@@ -2466,7 +3979,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2476,54 +3989,67 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, fuzzy, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Synkroniser"
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Synkroniser"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -2531,40 +4057,40 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
@@ -2575,7 +4101,7 @@ msgstr "Ukjend feil"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -2648,16 +4174,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Mottek meldingar frå %1"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slå saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Mottek meldingar frå %1"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, fuzzy, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Slett e-post frå tenaren"
@@ -2672,71 +4208,83 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 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:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -2777,145 +4325,266 @@ msgstr ""
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Vidaresendt melding frå %1"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Lagra melding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Skjul"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Ingen passord oppgitt."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: 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:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, 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:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 #, fuzzy
 msgid "1 byte"
@@ -2942,21 +4611,17 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 #, fuzzy
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Fjern"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 #, fuzzy
 msgid "Remove selected items from the attachment list"
@@ -2972,59 +4637,93 @@ msgstr "Vedlegg"
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: 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-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "Vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Attachment properties"
+msgstr "Vedleggseigenskapar"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Filnamn:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "Vedlegg"
+
+#: composer/e-msg-composer-attachment.glade.h:6
+#, fuzzy
+msgid "MIME type:"
+msgstr "MIME-type"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "Lagra: %s"
+
+#: composer/e-msg-composer-hdrs.c:314
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr ""
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "Frå:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Svar"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:384
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 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:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:336
-#, fuzzy
-msgid "Enter the subject of the mail"
-msgstr "Oppgi typen til medlemsvariabelen her."
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, fuzzy, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3034,45 +4733,31 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Lagrar alle endra filer ..."
-
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Lagrar alle endra filer ..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 #, fuzzy
 msgid "Evolution"
 msgstr "Oppløysing"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -3082,56 +4767,298 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 #, fuzzy
 msgid "That file does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 #, fuzzy
 msgid "That is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 #, fuzzy
 msgid "That file exists but is not readable."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:961
+#: composer/e-msg-composer.c:1027
 #, 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:982
+#: composer/e-msg-composer.c:1048
 #, fuzzy
 msgid "An error occurred while reading the file."
 msgstr "Feil ved opning av fil."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikkje initialisera lokale variablar"
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evalueringsfeil"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Adresse"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Informasjon"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr ""
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#, fuzzy
+msgid "%H:%M%n"
+msgstr "%H:%M"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%H:%M"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Øydelagd oppsettfil."
+
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: executive-summary/component/e-summary-callbacks.c:290
+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:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Hentar data frå %1"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Lukk"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Flytt til mappe"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Gå til neste som treng ettersyn"
+
+#: executive-summary/component/e-summary-url.c:79
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ikkje vis den overskytande teksten"
+
+#: executive-summary/component/e-summary-url.c:80
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:918
+#, 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:932
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+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/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "Samandrag"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Øydelagd oppsettfil."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Øydelagd oppsettfil."
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+#, fuzzy
+msgid "Error"
+msgstr "Ingen feil."
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update every "
+msgstr "Oppdateringsfrekvens"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minutt"
+
 #: filter/filter-datespec.c:62
 #, fuzzy
 msgid "year"
@@ -3182,10 +5109,6 @@ msgstr "time/timar"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutt"
-
 #: filter/filter-datespec.c:68
 #, fuzzy
 msgid "second"
@@ -3254,43 +5177,23 @@ msgstr "nei"
 msgid "<click here to select a date>"
 msgstr "Trykk for å velja ein skrifttype"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
 #, fuzzy
-msgid "Add Filter Rule"
+msgid "Filter Rules"
 msgstr "Filter-reglar"
 
-#: filter/filter-editor.c:233
-#, fuzzy
-msgid "Edit Filter Rule"
-msgstr "Rediger filterreglar"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
-#, fuzzy
-msgid "Edit Filters"
-msgstr "Rediger fil"
-
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 #, fuzzy
 msgid "Add action"
 msgstr "&Legg til handling"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 #, fuzzy
 msgid "Remove action"
 msgstr "Fjern ein kolonne"
@@ -3301,7 +5204,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -3315,7 +5218,7 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr "Trykk for å velja ein skrifttype"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3324,461 +5227,562 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 #, fuzzy
 msgid "Execute actions"
 msgstr "Køyr autorun.sh"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Fjern element"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Rediger fil"
+
+#: filter/filter.glade.h:5
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Rediger filterreglar"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid "Outgoing"
+msgstr "Oversikt"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Mapper"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: filter/filter.glade.h:12
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Kjelder"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
 #, fuzzy
-msgid "Date received"
-msgstr "Motta"
+msgid "Attachments"
+msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 #, fuzzy
-msgid "Date sent"
-msgstr "Dato"
+msgid "contains"
+msgstr "Handlingar"
 
 #: filter/libfilter-i18n.h:8
 #, fuzzy
-msgid "Expression"
-msgstr "&Yrke:"
+msgid "Copy to Folder"
+msgstr "Kopier til mappe"
 
 #: filter/libfilter-i18n.h:9
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
+msgid "Date received"
+msgstr "Motta"
 
 #: filter/libfilter-i18n.h:10
 #, fuzzy
-msgid "Message Body"
-msgstr "Flytta alle meldingar til papirkorga"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Melding motteken"
+msgid "Date sent"
+msgstr "Dato"
 
 #: filter/libfilter-i18n.h:12
-#, fuzzy
-msgid "Message was received"
-msgstr "Melding motteken"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "Lag meldingar og slå saman"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not exist"
+msgstr "Fila finst ikkje\n"
 
 #: filter/libfilter-i18n.h:15
 #, fuzzy
-msgid "Recipients"
-msgstr "Nyleg brukte fargar"
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+#, fuzzy
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
 
-#: 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:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "Fila finst ikkje\n"
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Send"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "Status:"
+msgid "Exist"
+msgstr "Avslutt"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "Source"
-msgstr "Kjelder"
+msgid "exists"
+msgstr "Neste"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+#, fuzzy
+msgid "Expression"
+msgstr "&Yrke:"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#: filter/libfilter-i18n.h:22
 #, fuzzy
-msgid "Status"
-msgstr "Status:"
+msgid "Forward to Address"
+msgstr "Vidaresendt melding"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+#, fuzzy
+msgid "is"
+msgstr "er"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Slutt etter"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "Handlingar"
+msgid "Mailing list"
+msgstr "E-post&liste for språket:"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Message Body"
+msgstr "Flytta alle meldingar til papirkorga"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:30
 #, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
+msgid "Message was received"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:31
 #, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
+msgid "Message was sent"
+msgstr "Lag meldingar og slå saman"
 
 #: filter/libfilter-i18n.h:32
 #, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "on or after"
+msgstr "Slutt etter"
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "exists"
-msgstr "Neste"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Recipients"
+msgstr "Nyleg brukte fargar"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "is"
-msgstr "er"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Poengsum"
 
 #: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
+msgid "Set Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Source"
+msgstr "Kjelder"
+
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-#, fuzzy
-msgid "was after"
-msgstr "Slutt etter"
+msgid "starts with"
+msgstr ""
 
-#: filter/libfilter-i18n.h:44
-msgid "was before"
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/score-editor.c:127
-#, fuzzy
-msgid "Add Rule"
-msgstr "Legg til fil"
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Emne"
 
-#: filter/score-editor.c:166
+#: filter/libfilter-i18n.h:47
 #, fuzzy
-msgid "Edit Score Rule"
-msgstr "Rediger filterreglar"
+msgid "was after"
+msgstr "Slutt etter"
 
-#: filter/vfolder-editor.c:155
-#, fuzzy
-msgid "Add VFolder Rule"
-msgstr "Rediger filterreglar"
+#: filter/libfilter-i18n.h:48
+msgid "was before"
+msgstr ""
 
-#: filter/vfolder-editor.c:204
+#: filter/score-editor.c:126
 #, fuzzy
-msgid "Edit VFolder Rule"
+msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
-#, fuzzy
-msgid "Store search as vFolder"
-msgstr "Vel mappe"
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr ""
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
 #, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr ""
+msgid "Properties"
+msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr ""
+#: mail/folder-browser.c:219
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Vel mappe"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 #, fuzzy
 msgid "VFolder on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 #, fuzzy
 msgid "VFolder on Sender"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 #, fuzzy
 msgid "VFolder on Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Fil alt i liste"
+
+#: mail/folder-browser.c:524
 #, fuzzy
 msgid "Filter on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 #, fuzzy
 msgid "Filter on Recipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Rediger"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "Fram"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 #, 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%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 "Ingen"
+#: mail/folder-browser.c:705
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Fil alt i liste"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Øydelagd oppsettfil."
 
-#: mail/mail-accounts.c:115
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "Kunne ikkje starta %1."
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Format"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "&Ny type"
+
+#: 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
+#, fuzzy
+msgid "maildir"
+msgstr "E-post 2"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "ms"
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "Er du sikker på at du vil sletta denne klassen?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 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
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
@@ -3794,12 +5798,17 @@ msgstr "Emne"
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "E-post&liste for språket:"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#, fuzzy
+msgid "Add Filter Rule"
+msgstr "Filter-reglar"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3807,110 +5816,406 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 #, 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:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 #, 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:893
+#: mail/mail-callbacks.c:1088
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "Små ikon"
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid "Account Information"
+msgstr "Informasjon"
+
+#: mail/mail-config.glade.h:3
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Legg til ..."
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentisering:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Skriftinnstillingar"
+
+#: mail/mail-config.glade.h:12
+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 ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Standard"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "Ingen"
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Full Name:"
+msgstr "Fullt namn"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Hostname:"
+msgstr "Brukarnamn:"
+
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "Slett e-post frå tenaren"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Tenar:"
+
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "Mail"
+msgstr "Send"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Mail Account"
+msgstr "Små ikon"
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Mail Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Oppsett"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "Lag meldingar og slå saman"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "News"
+msgstr "Ny ..."
+
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Optional"
+msgstr "Val"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Organisasjon:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Password:"
+msgstr "Lagra som"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "Send"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "Lagra som"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Required"
+msgstr "Motta"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Save password"
+msgstr "Lagra som"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "Send meldingar:"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Send"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config.glade.h:63
+#, fuzzy
+msgid "Server Type: "
+msgstr "Tenar:"
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Tenar:"
+
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Kjelder"
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Gjennomsiktig "
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Type:"
+
+#: mail/mail-config.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.glade.h:75
+#, fuzzy
+msgid "User Information"
+msgstr "Informasjon"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Brukarnamn:"
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#, fuzzy
+msgid "_Edit"
+msgstr "Rediger"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "minutt"
+
+#: mail/mail-config-druid.c:421
 #, 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
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "Navn:"
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3918,31 +6223,16 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, fuzzy, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
-
-#: mail/mail-display.c:131
-#, fuzzy, c-format
-msgid "Could not write data: %s"
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -3950,149 +6240,148 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:626
+#: mail/mail-format.c:704
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Svar"
+msgid "Loading message content"
+msgstr "Markerer meldingar"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Vidaresendt melding"
+
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 #, fuzzy
 msgid "Creating new folder"
 msgstr "Lagar ei ny mappe"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -4101,7 +6390,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -4110,172 +6399,116 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:107
-#, fuzzy, c-format
-msgid "Fetching email from %s"
-msgstr "Hentar data frå %1"
-
-#: mail/mail-ops.c:109
-#, fuzzy, c-format
-msgid "Fetch email from %s"
-msgstr "Slett e-post frå tenaren"
-
-#: 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:430
-#, fuzzy
-msgid "Filtering email on demand"
-msgstr "Ring ved førespurnad"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
 
-#: mail/mail-ops.c:432
+#: mail/mail-mt.c:860
 #, fuzzy
-msgid "Filter email on demand"
-msgstr "Ring ved førespurnad"
+msgid "Evolution progress"
+msgstr "Oppløysing"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: mail/mail-ops.c:682
-#, fuzzy
-msgid "Sending queue"
-msgstr "&Send meldingane i køen"
-
-#: mail/mail-ops.c:684
-#, fuzzy
-msgid "Send queue"
-msgstr "&Send meldingane i køen"
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, fuzzy, c-format
-msgid "Appending \"%s\""
-msgstr "Sender %1"
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
+#: mail/mail-ops.c:752
 #, fuzzy
-msgid "Appending a message without a subject"
-msgstr "Sender meldingar til %1"
-
-#: mail/mail-ops.c:912
-#, fuzzy, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
+msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:825
 #, fuzzy, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Mottek meldingar frå %1"
-
-#: mail/mail-ops.c:917
-#, fuzzy, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr ""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Melding"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-#, fuzzy
-msgid "(No description)"
-msgstr "Inga skildring"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Synkroniser"
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Les mapper"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Endra mappe"
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1672
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1686
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -4284,329 +6517,424 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-search-dialogue.c:104
-#, fuzzy
-msgid "Cancel"
-msgstr "Avbroten."
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
+#: mail/mail-ops.c:1760
 #, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "<ferdig melding>"
+msgid "Saving attachment"
+msgstr "Smarte vedlegg"
 
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1803
 #, fuzzy, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Feil ved laging av fil '%1':\n"
-"%2"
+msgid "Could not write data: %s"
+msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Søk"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "Avbroten."
 
-#: mail/mail-threads.c:917
+#: mail/mail-send-recv.c:231
 #, fuzzy
-msgid "Could not create dialog box."
-msgstr "Kunne ikkje laga kio-jobb.\n"
+msgid "Send & Receive mail"
+msgstr "Send"
 
-#: mail/mail-threads.c:928
+#: mail/mail-send-recv.c:234
 #, fuzzy
-msgid "User cancelled query."
+msgid "Receiving"
+msgstr "Motta"
+
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
 msgstr ""
-"Brukaren avbraut handling\n"
-"%1"
 
-#: mail/mail-tools.c:189
-#, fuzzy, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, fuzzy, c-format
-msgid "Examining %s"
-msgstr "Forventar %1"
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "Sender %1"
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "Avbroten."
 
-#: mail/mail-tools.c:300
-#, fuzzy, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Mottek meldingar frå %1"
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "Ferdig"
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, fuzzy, c-format
-msgid "Writing message %d of %d"
-msgstr "Mottek meldingar frå %1"
+#: mail/mail-summary.c:111
+#, fuzzy
+msgid "Incomplete message written on pipe!"
+msgstr "<ferdig melding>"
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:138
 #, fuzzy, c-format
-msgid "Saving changes to %s"
-msgstr "Lagrar alle endra filer ..."
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (ingen emne)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:530
-#, fuzzy, c-format
+#: mail/mail-tools.c:411
+#, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 #, fuzzy
 msgid "Forward this message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Sentrer dei valte elementa"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 #, fuzzy
 msgid "Delete this message"
 msgstr "Slett denne adressa"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Vidaresendt melding frå %1"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Lagra melding"
+
+#: mail/message-list.c:952
 #, 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:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ukjend"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "Vedlegg"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 msgid "From"
 msgstr "Frå"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Forfallsdato"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Received"
 msgstr "Motta"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 msgid "Size"
 msgstr "Storleik"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:92
 #, 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
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 #, 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
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 #, 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
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, 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
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, 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
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Mapper"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Poengsum"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:280
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:282
 #, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/subscribe-dialog.c:297
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Filnamn:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Mapper"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Ikkje nok skip å senda."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:309
 #, fuzzy, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Lag ny mappe i %1"
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Det er ikkje band i stasjonen."
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "Flyttar"
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:327
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/importer/importer.c:342
 #, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Mottek meldingar frå %1"
+msgid "Error loading %s"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+#, fuzzy
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Signaturfil:"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "Filnamn:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "KDeelop-installering"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "KDeelop-installering"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 #, fuzzy
@@ -4635,7 +6963,7 @@ msgstr "Alle filer vart sletta."
 
 #: shell/e-setup.c:189
 #, fuzzy
-msgid "This seems to be the first time you run Evolution."
+msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 "Dette er første nivå\n"
 "i denne samlinga."
@@ -4677,7 +7005,7 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4686,12 +7014,12 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 #, fuzzy
 msgid "The specified folder name is not valid."
 msgstr "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "Lagar ei ny mappe"
@@ -4702,7 +7030,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Ny ..."
 
@@ -4711,46 +7039,46 @@ msgstr "Ny ..."
 msgid "(Untitled)"
 msgstr "Utan tittel"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 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:334
+#: shell/e-shell-view-menu.c:360
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
@@ -4760,7 +7088,7 @@ msgstr "Evalueringsfeil"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4848,2093 +7176,2321 @@ msgstr "&Programsnøggtastar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip å senda."
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje støtta på tenar"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Kan ikkje initialisera adresseboka"
+
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
+#: shell/main.c:129
 #, fuzzy
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:178
+#: shell/main.c:175
 #, fuzzy
 msgid "Disable."
 msgstr "Deaktivert"
 
-#: shell/main.c:198
+#: shell/main.c:195
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "Avtale"
+msgid "Create new contact"
+msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-contact-editor.xml:8
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: 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 ""
+msgid "Delete a contact"
+msgstr "Slett kolonne"
 
-#: ui/evolution-contact-editor.xml:22
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 #, fuzzy
-msgid "FIXME: _Memo Style"
-msgstr "Elementstil"
+msgid "Find"
+msgstr "Finn ..."
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr ""
+msgid "Find a contact"
+msgstr "Slett kolonne"
 
-#: ui/evolution-contact-editor.xml:35
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Smarte vedlegg"
+msgid "New contact"
+msgstr "Se&nd avtale"
 
-#: ui/evolution-contact-editor.xml:38
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "Flytt til mappe"
+msgid "Previews the message to be printed"
+msgstr "Sen melding"
 
-#: ui/evolution-contact-editor.xml:39
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopier til mappe"
+msgid "Print contacts"
+msgstr "&Innhald ..."
 
-#: ui/evolution-contact-editor.xml:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 #, fuzzy
-msgid "Page Set_up"
-msgstr "Speloppsett"
+msgid "Stop"
+msgstr "Poengsum"
 
-#: ui/evolution-contact-editor.xml:42
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "&Førehandsvising ..."
+msgid "Stop Loading"
+msgstr "Lagring"
 
-#: ui/evolution-contact-editor.xml:63
+#: ui/evolution-addressbook.xml.h:14
 #, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "Lim inn spesiell ..."
+msgid "View All"
+msgstr "Vinkel"
 
-#: ui/evolution-contact-editor.xml:68
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Mar&ker som ulesen"
+msgid "View all contacts"
+msgstr "Slett kolonne"
 
-#: ui/evolution-contact-editor.xml:72
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
-msgid "_Object"
-msgstr "Objekt"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
+msgid "_Addressbook Sources..."
+msgstr "Kjelde:"
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "&Innhald ..."
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+#, fuzzy
+msgid "_Print..."
+msgstr "Skriv ut"
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 #, fuzzy
-msgid "FIXME: _Standard"
-msgstr "Standard"
+msgid "_Tools"
+msgstr "Verktøy"
 
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-calendar.xml.h:1
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "Tekstformatering"
+msgid "5 Days"
+msgstr " dag"
 
-#: ui/evolution-contact-editor.xml:96
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "FIXME: _Customize..."
-msgstr "Tilpass ..."
+msgid "Alter preferences"
+msgstr "Innstillingar"
 
-#: ui/evolution-contact-editor.xml:101
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Pre_vious"
-msgstr "Førre"
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
 
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Ne_xt"
-msgstr "Neste"
+msgid "Create a new calendar"
+msgstr "Feil ved opning"
 
-#: ui/evolution-contact-editor.xml:104
-#, fuzzy
-msgid "_Toolbars"
-msgstr "Verktøylinjer"
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "Dag"
 
-#: ui/evolution-contact-editor.xml:109
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
-msgid "FIXME: _File..."
-msgstr "Sett inn fil ..."
+msgid "Go To"
+msgstr "Gå til side"
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Go back in time"
+msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-contact-editor.xml:111
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
-msgid "FIXME: _Object..."
-msgstr "&Objekt ..."
+msgid "Go forward in time"
+msgstr "Fram"
 
-#: ui/evolution-contact-editor.xml:116
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Skrifttype ..."
+msgid "Go to a specific date"
+msgstr "Gå til side"
 
-#: ui/evolution-contact-editor.xml:117
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
-msgid "FIXME: _Paragraph..."
-msgstr "&Avsnitt ..."
+msgid "Go to present time"
+msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Månad"
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
+msgstr "&Vis avtale ..."
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+#, fuzzy
+msgid "Next"
+msgstr "Neste"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "Open Calendar"
+msgstr "Feil ved opning"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Prev"
+msgstr "Førehandsvising:"
 
-#: ui/evolution-contact-editor.xml:135
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
-msgid "FIXME: _Spelling..."
-msgstr "&Stavekontroll ..."
+msgid "Print calendar"
+msgstr "Skriv ut alle"
 
-#: ui/evolution-contact-editor.xml:137
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "_Forms"
-msgstr "Forum"
+msgid "Print this Calendar"
+msgstr "Skriv ut alle"
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "Se&nd avtale"
+msgid "Save As"
+msgstr "Lagra"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr ""
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Show 1 day"
+msgstr "Vis dato"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Sender ei melding til ein nettverksspelar"
+msgid "Show 1 month"
+msgstr "Vis metodar"
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr ""
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show 1 week"
+msgstr "Vis %1"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "&Stavekontroll ..."
+msgid "Show the working week"
+msgstr "Vis hovudvindauget"
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "Ny oppgåve"
+msgid "Today"
+msgstr "i dag"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr ""
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Veke"
 
-#: ui/evolution-contact-editor.xml:152
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "Kopier til mappe"
-
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
+msgid "_Appointment"
+msgstr "Avtale"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "&Stavekontroll ..."
+msgid "_New"
+msgstr "Vis"
 
-#: ui/evolution-contact-editor.xml:156
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "Fort framover"
+msgid "_Open Calendar"
+msgstr "Feil ved opning"
 
-#: ui/evolution-contact-editor.xml:157
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Fort framover"
+msgid "_Save As..."
+msgstr "Lagra som ..."
 
-#: ui/evolution-contact-editor.xml:169
+#: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
-msgid "_Insert"
-msgstr "Set inn"
+msgid "Delete this item"
+msgstr "Slett denne adressa"
 
-#: ui/evolution-contact-editor.xml:170
+#: ui/evolution-contact-editor.xml.h:3
 #, fuzzy
-msgid "F_ormat"
-msgstr "Format"
+msgid "Delete..."
+msgstr "Slett"
 
-#: ui/evolution-contact-editor.xml:171
+#: ui/evolution-contact-editor.xml.h:4
 #, fuzzy
-msgid "_Tools"
-msgstr "Verktøy"
+msgid "Help"
+msgstr "Heim"
 
-#: ui/evolution-contact-editor.xml:172
+#: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
-msgid "Actio_ns"
-msgstr "Handlingar"
+msgid "Print En_velope..."
+msgstr "Private meldingar"
 
-#: ui/evolution-contact-editor.xml:246
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
 #, fuzzy
-msgid "FIXME: Previous"
-msgstr "Førre"
+msgid "Print this item"
+msgstr "Skriv til fil"
 
-#: ui/evolution-contact-editor.xml:247
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 #, fuzzy
-msgid "Go to the previous item"
-msgstr "Gå til neste som treng ettersyn"
+msgid "Print..."
+msgstr "Skriv ut"
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "Finn neste"
+msgid "Save _As..."
+msgstr "Lagra som ..."
 
-#: ui/evolution-contact-editor.xml:250
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Ikkje vis den overskytande teksten"
+msgid "Save and Close"
+msgstr "Lagra ei fil"
 
-#. 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"
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Mellombels"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Oppteke"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: ui/evolution-contact-editor.xml.h:12
 #, fuzzy
-msgid "Out of Office"
-msgstr "Kontor"
+msgid "See online help"
+msgstr "Me er tilkopla!"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: ui/evolution-contact-editor.xml.h:13
 #, fuzzy
-msgid "No Information"
-msgstr "Informasjon"
+msgid "Send _message to contact..."
+msgstr "Sender ei melding til ein nettverksspelar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 #, fuzzy
-msgid "_Invite Others..."
-msgstr "Andre ..."
+msgid "_File"
+msgstr "Fil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
 #, fuzzy
-msgid "_Options"
-msgstr "Val"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr ""
+msgid "_Save"
+msgstr "Lagra"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
 #, fuzzy
-msgid "Show _Zoomed Out"
-msgstr "Forminsk"
+msgid "About this application"
+msgstr "Autentisering:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
 #, fuzzy
-msgid "_Update Free/Busy"
-msgstr "Oppdateringsfrekvens"
+msgid "About..."
+msgstr "Skrifttype ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 #, fuzzy
-msgid "_<<"
-msgstr "<<"
+msgid "Actio_ns"
+msgstr "Handlingar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 #, fuzzy
-msgid "_Autopick"
-msgstr "Automatisk"
+msgid "Address _Book... (FIXME)"
+msgstr "Adresse&bok ..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 #, fuzzy
-msgid ">_>"
-msgstr ">>"
+msgid "C_lear"
+msgstr "Teikn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 #, fuzzy
-msgid "_All People and Resources"
-msgstr "Alle filer og katalogar"
+msgid "C_ut"
+msgstr "Klipp ut"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+msgid "Chec_k Names (FIXME)"
 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 ""
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#, fuzzy
+msgid "Clear"
+msgstr "Teikn"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
 #, fuzzy
-msgid "Meeting _start time:"
-msgstr "&Helsingstekst:"
+msgid "Clear the selection"
+msgstr "Slettar den valte fila"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Close this appointment"
+msgstr "&Slett avtale"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 #, fuzzy
-msgid "All Attendees"
-msgstr "Kontaktar"
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Flytt til mappe"
 
-#. 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:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Kopier"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
 #, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
+msgid "Copy the selection"
+msgstr "Slettar den valte fila"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr " ..."
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: widgets/misc/e-dateedit.c:407
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
 #, fuzzy
-msgid "Now"
-msgstr "&No"
+msgid "Cut the selection"
+msgstr "Slettar den valte fila"
 
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-event-editor.xml.h:18
 #, fuzzy
-msgid "Today"
-msgstr "i dag"
+msgid "Delete this appointment"
+msgstr "&Slett avtale"
 
-#. 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-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+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
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 #, fuzzy
-msgid "%I:%M %p"
-msgstr "%H:%M"
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "Lagrar fil ..."
 
-#: widgets/misc/e-search-bar.c:176
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Søk"
+msgid "For_ward (FIXME)"
+msgstr "Comment=X-redigering"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, fuzzy, c-format
-msgid "Group %i"
-msgstr "Gruppe %1"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 #, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "Slett kolonne"
+msgid "Go to the next item"
+msgstr "Ikkje vis den overskytande teksten"
 
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 #, fuzzy
-#~ msgid "Address _2:"
-#~ msgstr "Adresse"
+msgid "Go to the previous item"
+msgstr "Gå til neste som treng ettersyn"
 
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
 #, fuzzy
-#~ msgid "Check Address"
-#~ msgstr "Alternativ adresse"
+msgid "In_complete Task (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 #, fuzzy
-#~ msgid "Countr_y:"
-#~ msgstr "Land:"
+msgid "Modify the file's properties"
+msgstr "Linjeeigenskapar"
 
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
 #, fuzzy
-#~ msgid "_Address:"
-#~ msgstr "Adresse"
+msgid "N_ext"
+msgstr "Neste"
 
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
 #, fuzzy
-#~ msgid "_City:"
-#~ msgstr "Stad:"
+msgid "Paste the clipboard"
+msgstr "Limer inn ..."
 
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 #, fuzzy
-#~ msgid "_PO Box:"
-#~ msgstr "Postboks"
+msgid "Pre_vious"
+msgstr "Førre"
 
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
 #, fuzzy
-#~ msgid "_State/Province:"
-#~ msgstr "Stat/provins"
+msgid "Previous"
+msgstr "Førre"
 
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 #, fuzzy
-#~ msgid "_ZIP Code:"
-#~ msgstr "ZIP/Postnummer"
+msgid "Print Pre_view"
+msgstr "&Førehandsvising ..."
 
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Kjelde:"
+msgid "Print S_etup..."
+msgstr "Speloppsett"
 
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
 #, fuzzy
-#~ msgid "URI"
-#~ msgstr "URL"
+msgid "Print Setup"
+msgstr "Speloppsett"
 
-#~ msgid "Find..."
-#~ msgstr "Finn ..."
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Lagra"
 
-#, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "Melding motteken"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
 #, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "Merk område"
+msgid "Save the current file"
+msgstr "tid no"
 
+#: ui/evolution-event-editor.xml.h:46
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Vel ei gruppe først."
+msgid "Schedule _Meeting"
+msgstr "Køyreplan ..."
 
+#: ui/evolution-event-editor.xml.h:47
 #, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
+msgid "Schedule some sort of a meeting"
+msgstr "Køyreplan ..."
 
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
-#~ msgid "b"
-#~ msgstr "av"
+msgid "Select All"
+msgstr "Vel mappe"
 
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
 #, fuzzy
-#~ msgid "c"
-#~ msgstr "cm"
+msgid "Select everything"
+msgstr "Vel mappe"
 
-#, fuzzy
-#~ msgid "d"
-#~ msgstr "Id"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
 #, fuzzy
-#~ msgid "g"
-#~ msgstr "gs"
+msgid "_About..."
+msgstr "Skrifttype ..."
 
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 #, fuzzy
-#~ msgid "i"
-#~ msgstr "er"
+msgid "_Close"
+msgstr "Lukk"
 
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
 #, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
+msgid "_Contact (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 #, fuzzy
-#~ msgid "m"
-#~ msgstr "ms"
+msgid "_Copy"
+msgstr "Kopier"
+
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 #, fuzzy
-#~ msgid "n"
-#~ msgstr "På"
+msgid "_Help"
+msgstr "Heim"
 
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
 #, fuzzy
-#~ msgid "o"
-#~ msgstr "Nei"
+msgid "_Item (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
 #, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
+msgid "_Journal Entry (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
 #, fuzzy
-#~ msgid "r"
-#~ msgstr "Dr"
+msgid "_Last Item in Folder (FIXME)"
+msgstr "Lagrar fil ..."
 
-#~ msgid "s"
-#~ msgstr "s"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+msgid "_Mail Message (FIXME)"
+msgstr ""
 
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
 #, fuzzy
-#~ msgid "t"
-#~ msgstr "Qt"
+msgid "_Move to Folder... (FIXME)"
+msgstr "Flytt til mappe"
 
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
 #, fuzzy
-#~ msgid "x"
-#~ msgstr "Tx"
+msgid "_Note (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
 #, fuzzy
-#~ msgid "y"
-#~ msgstr "av"
+msgid "_Paste"
+msgstr "Lim inn"
 
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-#~ msgid "z"
-#~ msgstr "Hz"
-
-#~ msgid "Body"
-#~ msgstr "Kropp"
-
-#~ msgid "Bottom:"
-#~ msgstr "Botn:"
+msgid "_Print"
+msgstr "Skriv ut"
 
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 #, fuzzy
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensjonar"
-
-#~ msgid "Font..."
-#~ msgstr "Skrifttype ..."
-
-#~ msgid "Fonts"
-#~ msgstr "Skrifttypar"
+msgid "_Properties..."
+msgstr "Eigenskapar ..."
 
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
 #, fuzzy
-#~ msgid "Footer:"
-#~ msgstr "Botntekst"
-
-#~ msgid "Format"
-#~ msgstr "Format"
-
-#~ msgid "Header"
-#~ msgstr "Dekl."
+msgid "_Select All"
+msgstr "Vel mappe"
 
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
 #, fuzzy
-#~ msgid "Header/Footer"
-#~ msgstr "&Topp-/botntekst ..."
+msgid "_Task (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
 #, fuzzy
-#~ msgid "Headings"
-#~ msgstr "Les"
+msgid "_Unread Item (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-#~ msgid "Headings for each letter"
-#~ msgstr "Les mapper"
+msgid "Add Service"
+msgstr "Kjelde:"
 
-#~ msgid "Height:"
-#~ msgstr "Høgd:"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
+#: ui/evolution-executive-summary.xml.h:3
 #, fuzzy
-#~ msgid "Include:"
-#~ msgstr "Inkluder fil"
-
-#~ msgid "Landscape"
-#~ msgstr "Liggjande"
+msgid "Create a new email"
+msgstr "Lagar eit nytt dokument"
 
-#~ msgid "Left:"
-#~ msgstr "Venstre:"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
+#: ui/evolution-executive-summary.xml.h:5
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "&Marg"
+msgid "New Mail"
+msgstr "Detaljar"
 
+#: ui/evolution-mail.xml.h:2
 #, fuzzy
-#~ msgid "Number of columns:"
-#~ msgstr "Tal på kolonnar:"
-
-#~ msgid "Options"
-#~ msgstr "Val"
-
-#~ msgid "Orientation"
-#~ msgstr "Retning"
-
-#~ msgid "Page"
-#~ msgstr "Side"
+msgid "Compose"
+msgstr "Lukk"
 
+#: ui/evolution-mail.xml.h:3
 #, fuzzy
-#~ msgid "Page Setup:"
-#~ msgstr "Speloppsett"
-
-#~ msgid "Paper"
-#~ msgstr "Papir"
+msgid "Compose a new message"
+msgstr "Lukk melding"
 
+#: ui/evolution-mail.xml.h:5
 #, fuzzy
-#~ msgid "Paper source:"
-#~ msgstr "Papir&storleik:"
+msgid "Copy message to a new folder"
+msgstr "&Kopier bileteplassering"
 
-#~ msgid "Portrait"
-#~ msgstr "Ståande"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Mapper"
 
-#~ msgid "Preview:"
-#~ msgstr "Førehandsvising:"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
-#~ msgid "Print using gray shading"
-#~ msgstr "Skriv med grånyansar"
+msgid "Empty Trash"
+msgstr " dag"
 
+#: ui/evolution-mail.xml.h:11
 #, fuzzy
-#~ msgid "Reverse on even pages"
-#~ msgstr "Merk partal-sider"
-
-#~ msgid "Right:"
-#~ msgstr "Høgre:"
+msgid "Filter on Se_nder"
+msgstr "Fil under:"
 
+#: ui/evolution-mail.xml.h:12
 #, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Del:"
+msgid "Filter on _Recipients"
+msgstr "Skriv ut filer"
 
+#: ui/evolution-mail.xml.h:13
 #, fuzzy
-#~ msgid "Shading"
-#~ msgstr "Lagring"
-
-#~ msgid "Size:"
-#~ msgstr "Storleik:"
+msgid "Filter on _Subject"
+msgstr "Ingen emne"
 
+#: ui/evolution-mail.xml.h:14
 #, fuzzy
-#~ msgid "Start on a new page"
-#~ msgstr "Startar nytt spel ..."
+msgid "Forget _Passwords"
+msgstr "Lagra som"
 
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-#~ msgid "Style name:"
-#~ msgstr "Typenamn:"
+msgid "Forward As"
+msgstr "Fram"
 
-#~ msgid "Top:"
-#~ msgstr "Topp:"
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Full Headers"
+msgstr "Dekl."
 
-#~ msgid "Type:"
-#~ msgstr "Type:"
+#: ui/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Sentrer dei valte elementa"
 
-#~ msgid "Width:"
-#~ msgstr "Breidd:"
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Neste melding"
 
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
-#~ msgid "label26"
-#~ msgstr "Etikett"
+msgid "Hide _Read messages"
+msgstr "Vidaresendt melding frå %1"
 
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Skriv ut alle"
+msgid "Inline"
+msgstr "Vinkel"
 
+#: ui/evolution-mail.xml.h:23
 #, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Kan ikkje initialisera lokale variablar"
+msgid "Manage _Subscriptions..."
+msgstr "Skildring:"
 
+#: ui/evolution-mail.xml.h:24
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Tilgjengelege lenkjer:"
+msgid "Mar_k as Read"
+msgstr "Mar&ker som ulesen"
 
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "Øydelagd oppsettfil."
+msgid "Mark All as R_ead"
+msgstr "Mar&ker som ulesen"
 
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "&Endra avtale ..."
+msgid "Mark as U_nread"
+msgstr "Mar&ker som ulesen"
 
+#: ui/evolution-mail.xml.h:27
 #, fuzzy
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Låg grense (minutt):"
+msgid "Message _Display"
+msgstr "Endra tidsvising"
 
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "minutt"
+msgid "Move"
+msgstr "Mån"
 
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "minutt"
+msgid "Move message to a new folder"
+msgstr "Lagra side til ascii-fil"
 
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "minutt"
+msgid "Print message to the printer"
+msgstr "Sen melding"
 
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
-#~ msgid "24 hour"
-#~ msgstr "time/timar"
+msgid "Quoted"
+msgstr "Ingen"
 
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "minutt"
+msgid "Reply to _All"
+msgstr "Svar til alle:"
 
+#: ui/evolution-mail.xml.h:43
 #, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "minutt"
+msgid "S_ource"
+msgstr "Kjelder"
 
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 #, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Skriv ut alle"
+msgid "Select _All"
+msgstr "Vel mappe"
 
+#: ui/evolution-mail.xml.h:45
 #, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "Innstillingar"
+msgid "Select _Thread"
+msgstr "Vel mappe"
+
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "Colors"
-#~ msgstr "Fargar"
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
-#~ msgid "Defaults"
-#~ msgstr "Standard"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Vidaresendt melding frå %1"
 
+#: ui/evolution-mail.xml.h:50
 #, fuzzy
-#~ msgid "Display options"
-#~ msgstr "Vis"
+msgid "Threaded Message list"
+msgstr "Vidaresendt melding frå %1"
 
+#: ui/evolution-mail.xml.h:51
 #, fuzzy
-#~ msgid "End of day:"
-#~ msgstr "Slutt trekk"
+msgid "VFolder on Se_nder"
+msgstr "Mappenamn:"
 
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
-#~ msgid "Highlight"
-#~ msgstr "Opplysing:"
+msgid "VFolder on _Recipients"
+msgstr "Mappa finst: "
 
+#: ui/evolution-mail.xml.h:53
 #, fuzzy
-#~ msgid "Items Due Today"
-#~ msgstr "&Opplys syntaks"
+msgid "VFolder on _Subject"
+msgstr "Ingen emne"
 
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:55
 #, fuzzy
-#~ msgid "Overdue Items"
-#~ msgstr "&Syntaksmerkingsmodusar"
+msgid "Virtual Folder _Editor..."
+msgstr "Mapper"
 
+#: ui/evolution-mail.xml.h:56
 #, fuzzy
-#~ msgid "Remind me of all appointments"
-#~ msgstr "&Slett avtale"
+msgid "_Actions"
+msgstr "Handlingar"
 
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
-#~ msgid "Reminders"
-#~ msgstr "Påminning:"
+msgid "_Apply Filters"
+msgstr "Rediger fil"
 
+#: ui/evolution-mail.xml.h:58
 #, fuzzy
-#~ msgid "Show week numbers"
-#~ msgstr "Vis %1"
+msgid "_Compose"
+msgstr "Lukk"
 
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-#~ msgid "Start of day:"
-#~ msgstr "Start-dato"
+msgid "_Copy to Folder..."
+msgstr "Kopier til mappe"
+
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "Oppgåve"
+msgid "_Filters..."
+msgstr "E-post:"
 
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
 #, fuzzy
-#~ msgid "Time Until Due"
-#~ msgstr "Tid og dato"
+msgid "_Folder"
+msgstr "Mapper"
 
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
-#~ msgid "Time divisions:"
-#~ msgstr "Dimensjonar"
+msgid "_Forward"
+msgstr "Fram"
 
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 #, fuzzy
-#~ msgid "Time format:"
-#~ msgstr "Tidsformat:"
+msgid "_Invert Selection"
+msgstr "Slettar den valte fila"
 
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarm"
+msgid "_Mail Message"
+msgstr "Legg til melding"
 
+#: ui/evolution-mail.xml.h:68
 #, fuzzy
-#~ msgid "Work week"
-#~ msgstr "Veke"
+msgid "_Mail Settings..."
+msgstr "Skriftinnstillingar"
 
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-#~ msgid "seconds."
-#~ msgstr "sekund"
+msgid "_Message Hiding"
+msgstr "Legg til melding"
 
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
-#~ msgid "% Comp_lete:"
-#~ msgstr "Ferdig"
+msgid "_Move to Folder..."
+msgstr "Flytt til mappe"
 
+#: ui/evolution-mail.xml.h:71
 #, fuzzy
-#~ msgid "C_lassification:"
-#~ msgstr "&Forstørring"
+msgid "_Open Selected Items"
+msgstr "Opna med %1"
 
-#~ msgid "Completed"
-#~ msgstr "Ferdig"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Date Completed:"
-#~ msgstr "Ferdig"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
 
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
-#~ msgid "High"
-#~ msgstr "Høgd"
+msgid "_Undelete"
+msgstr "Slett"
 
+#: ui/evolution-message-composer.xml.h:1
 #, fuzzy
-#~ msgid "In Progress"
-#~ msgstr "Framgong:"
+msgid "Attach"
+msgstr "&Legg ved"
 
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
 #, fuzzy
-#~ msgid "Low"
-#~ msgstr "Senk"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
+msgid "Close the current file"
+msgstr "tid no"
 
+#: ui/evolution-message-composer.xml.h:5
 #, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "Starta"
+msgid "Encrypt this message with PGP"
+msgstr "Lagra melding"
 
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-#~ msgid "S_ummary"
-#~ msgstr "Samandrag"
+msgid "F_ormat"
+msgstr "Format"
 
-#~ msgid "Task"
-#~ msgstr "Oppgåve"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr "HTML"
 
+#: ui/evolution-message-composer.xml.h:8
 #, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "&Innhald ..."
+msgid "Insert a file as text into the message"
+msgstr "Oppgi eit nytt namn på meldinga."
 
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-#~ msgid "_Due Date:"
-#~ msgstr "Forfallsdato:"
+msgid "Insert text file..."
+msgstr "Sett inn fil ..."
 
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Prioritet:"
+msgid "Open a file"
+msgstr "Opna fil"
 
-#, fuzzy
-#~ msgid "_Status:"
-#~ msgstr "Status:"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Avtale"
+msgid "Save in _folder... (FIXME)"
+msgstr "Lagrar fil ..."
 
+#: ui/evolution-message-composer.xml.h:19
 #, fuzzy
-#~ msgid "Custom recurrence"
-#~ msgstr "Repetering"
+msgid "Save in folder..."
+msgstr "Lagrar fil ..."
 
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-#~ msgid "Days"
-#~ msgstr "Dag"
+msgid "Save the current file with a different name"
+msgstr "Sender ei melding til ein nettverksspelar"
 
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-#~ msgid "Every"
-#~ msgstr "kvar"
+msgid "Save the message in a specified folder"
+msgstr "Lagra side til ascii-fil"
 
-#~ msgid "Exceptions"
-#~ msgstr "Unntak"
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr "Send"
 
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
-#~ msgid "Hours"
-#~ msgstr "time/timar"
+msgid "Send _Later"
+msgstr "Send &seinare"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "E-post:"
+msgid "Send _later"
+msgstr "Send &seinare"
 
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-#~ msgid "Minutes"
-#~ msgstr "minutt"
+msgid "Send the mail in HTML format"
+msgstr "Send meldingar:"
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Måndag"
+msgid "Send the message later"
+msgstr "Sen melding"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "No recurrence"
-#~ msgstr "Repetering"
+msgid "Send the message now"
+msgstr "Sen melding"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Førehandsvising:"
+msgid "Send this message now"
+msgstr "Sen melding"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Privat"
+msgid "Show / hide attachments"
+msgstr "Vedlegg som ikon"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "Pu_blic"
-#~ msgstr "Praksis"
-
-#~ msgid "Recurrence"
-#~ msgstr "Repetering"
+msgid "Show _attachments"
+msgstr "Vedlegg"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regel for repetering"
+msgid "Show attachments"
+msgstr "Vedlegg"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "Reminder"
-#~ msgstr "Påminning:"
+msgid "Sign this message with your PGP key"
+msgstr "Sender meldingar til %1"
 
-#, fuzzy
-#~ msgid "Simple recurrence"
-#~ msgstr "Repetering"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "Samandrag:"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
 
-#~ msgid "Time"
-#~ msgstr "Tid"
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Audio"
-#~ msgstr "Lyd"
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Confidential"
-#~ msgstr "Eksponentiell"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_End time:"
-#~ msgstr "Slutt-tid:"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "Send"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
-#~ msgid "_Program"
-#~ msgstr "Program"
+msgid "_Insert"
+msgstr "Set inn"
 
+#: ui/evolution-message-composer.xml.h:48
 #, fuzzy
-#~ msgid "_Run program:"
-#~ msgstr "Terminalprogram:"
+msgid "_Insert text file... (FIXME)"
+msgstr "Sett inn fil ..."
 
+#: ui/evolution-message-composer.xml.h:49
 #, fuzzy
-#~ msgid "_Start time:"
-#~ msgstr "Start-tid:"
+msgid "_Open..."
+msgstr "Opna ..."
 
+#: ui/evolution-message-composer.xml.h:50
 #, fuzzy
-#~ msgid "_Starting date:"
-#~ msgstr "Start-dato"
+msgid "_Reply-To Field"
+msgstr "Svar"
 
-#~ msgid "day(s)"
-#~ msgstr "dag(ar)"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
 
-#, fuzzy
-#~ msgid "event-editor-dialog"
-#~ msgstr "Opnar angrehistoriedialogen"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
+#: ui/evolution-subscribe.xml.h:3
 #, fuzzy
-#~ msgid "for"
-#~ msgstr "Munnar"
+msgid "F_older"
+msgstr "Mapper"
 
-#, fuzzy
-#~ msgid "forever"
-#~ msgstr "Repeterer for alltid"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
 
-#, fuzzy
-#~ msgid "label21"
-#~ msgstr "Etikett"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
 
-#~ msgid "month(s)"
-#~ msgstr "månad(er)"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
 
+#: ui/evolution-subscribe.xml.h:8
 #, fuzzy
-#~ msgid "until"
-#~ msgstr "utan tittel"
+msgid "Subscribe"
+msgstr "Kjelder"
+
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:5
 #, fuzzy
-#~ msgid "week(s)"
-#~ msgstr "veke(r) på:"
+msgid "Assig_n Task (FIXME)"
+msgstr "Comment=X-redigering"
 
-#~ msgid "year(s)"
-#~ msgstr "år"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:29
 #, fuzzy
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+msgid "Meeting Re_quest (FIXME)"
+msgstr "&Førehandsvising ..."
 
+#: ui/evolution-task-editor-dialog.xml.h:43
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "April"
+msgid "Redo"
+msgstr "Tilfeldig"
 
+#: ui/evolution-task-editor-dialog.xml.h:44
 #, fuzzy
-#~ msgid "August"
-#~ msgstr "August"
+msgid "Redo the undone action"
+msgstr "Fjern ein kolonne"
 
+#: ui/evolution-task-editor-dialog.xml.h:45
 #, fuzzy
-#~ msgid "December"
-#~ msgstr "Desember"
+msgid "Replace"
+msgstr "Svar"
 
+#: ui/evolution-task-editor-dialog.xml.h:46
 #, fuzzy
-#~ msgid "February"
-#~ msgstr "Februar"
+msgid "Replace a string"
+msgstr "Svar"
 
+#: ui/evolution-task-editor-dialog.xml.h:47
 #, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Gå til side"
+msgid "Reply to A_ll (FIXME)"
+msgstr "Svar til alle:"
 
+#: ui/evolution-task-editor-dialog.xml.h:48
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Gå til &i dag"
+msgid "S_end Status Report (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-task-editor-dialog.xml.h:49
 #, fuzzy
-#~ msgid "January"
-#~ msgstr "Januar"
+msgid "S_kip Occurrence (FIXME)"
+msgstr "Førekomst"
 
-#, fuzzy
-#~ msgid "July"
-#~ msgstr "Juli"
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr ""
 
-#, fuzzy
-#~ msgid "June"
-#~ msgstr "Juni"
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr ""
+
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:62
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "Mars"
+msgid "Undo the last action"
+msgstr "Fjern ein kolonne"
 
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Måndag"
+msgid "_Appointment (FIXME)"
+msgstr "Avtale"
 
+#: ui/evolution-task-editor-dialog.xml.h:77
 #, fuzzy
-#~ msgid "November"
-#~ msgstr "November"
+msgid "_Mark Complete (FIXME)"
+msgstr "Ferdig"
 
+#: ui/evolution-task-editor-dialog.xml.h:84
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "Oktober"
+msgid "_Reply (FIXME)"
+msgstr "Comment=X-redigering"
 
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-#~ msgid "September"
-#~ msgstr "September"
+msgid "Create a new task"
+msgstr "Lagar eit nytt dokument"
 
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Vedleggseigenskapar"
+msgid "New Task"
+msgstr "Oppgåve"
 
-#~ msgid "File name:"
-#~ msgstr "Filnamn:"
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
 
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
-#~ msgid "MIME type:"
-#~ msgstr "MIME-type"
+msgid "Tasks Preferences..."
+msgstr "Innstillingar"
 
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "Rediger filterreglar"
+msgid "_Task"
+msgstr "Oppgåve"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "Filter Rules"
-#~ msgstr "Filter-reglar"
+msgid "About Evolution..."
+msgstr "Oppløysing"
 
+#: ui/evolution.xml.h:3
 #, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr "Oversikt"
+msgid "Close this window"
+msgstr "&Slett avtale"
 
-#, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "Mapper"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
+#: ui/evolution.xml.h:5
 #, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "Kjelder"
+msgid "Customize"
+msgstr "Tilpass ..."
 
-#~ msgid "Save"
-#~ msgstr "Lagra"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Skjul"
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
 
+#: ui/evolution.xml.h:8
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Slett"
+msgid "E_xit"
+msgstr "Avslutt"
 
+#: ui/evolution.xml.h:9
 #, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Emne"
+msgid "Evolution bar _shortcut"
+msgstr "Evalueringsfeil"
 
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Fil under:"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
 
+#: ui/evolution.xml.h:11
 #, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Lagra melding"
+msgid "Getting _Started"
+msgstr "Starta"
 
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Emne"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Kunne ikkje starta %1."
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Format"
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
 
-#, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "&Ny type"
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
 
-#, fuzzy
-#~ msgid "mh"
-#~ msgstr "ms"
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
 
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:19
 #, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Informasjon"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "&Programsnøggtastar"
 
+#: ui/evolution.xml.h:20
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Vedleggseigenskapar"
+msgid "Using the C_ontact Manager"
+msgstr "Skriv ut alle"
 
+#: ui/evolution.xml.h:21
 #, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Legg til ..."
+msgid "Using the _Calendar"
+msgstr "Skriv ut alle"
 
+#: ui/evolution.xml.h:22
 #, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autentisering:"
+msgid "Using the _Mailer"
+msgstr "Skriv ut alle"
 
+#: ui/evolution.xml.h:23
 #, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autentisering:"
+msgid "Work Offline"
+msgstr "Flyttar"
 
+#: ui/evolution.xml.h:24
 #, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Slett e-post frå tenaren"
+msgid "_About Evolution..."
+msgstr "Oppløysing"
 
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "Ingen"
+msgid "_Folder Bar"
+msgstr "Mapper"
 
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-post-adresse:"
+msgid "_Go to Folder..."
+msgstr "Flytt til mappe"
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "E-post-adresse:"
+msgid "_Import file..."
+msgstr "Sett inn fil ..."
 
+#: ui/evolution.xml.h:35
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Oppsett"
+msgid "_Index"
+msgstr "Set inn"
 
+#: ui/evolution.xml.h:36
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Fullt namn"
+msgid "_Mail message"
+msgstr "Legg til melding"
 
+#: ui/evolution.xml.h:38
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Brukarnamn:"
+msgid "_New Folder"
+msgstr "Ny mappe"
 
-#~ msgid "Identity"
-#~ msgstr "Identitet"
+#: ui/evolution.xml.h:39
+msgid "_Shortcut Bar"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mail"
-#~ msgstr "Send"
+#. 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 "Mail Account"
-#~ msgstr "Små ikon"
+#: 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 "Mail Configuration"
-#~ msgstr "Oppsett"
+msgid "Out of Office"
+msgstr "Kontor"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Oppsett"
+msgid "No Information"
+msgstr "Informasjon"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "Ny ..."
+msgid "_Invite Others..."
+msgstr "Andre ..."
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Val"
+msgid "_Options"
+msgstr "Val"
 
-#~ msgid "Organization:"
-#~ msgstr "Organisasjon:"
+#: 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
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Svar"
+msgid "Show _Zoomed Out"
+msgstr "Forminsk"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Lagra som"
+msgid "_Update Free/Busy"
+msgstr "Oppdateringsfrekvens"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Signaturfil:"
+msgid "_<<"
+msgstr "<<"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 #, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Send"
+msgid "_Autopick"
+msgstr "Automatisk"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 #, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Oppsett"
+msgid ">_>"
+msgstr ">>"
 
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 #, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Tenar:"
+msgid "_All People and Resources"
+msgstr "Alle filer og katalogar"
 
-#, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Tenar:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Signature file:"
-#~ msgstr "Signaturfil:"
+#: 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 "Signature:"
-#~ msgstr "Signaturfil:"
+msgid "Meeting _start time:"
+msgstr "&Helsingstekst:"
 
-#~ msgid "Sources"
-#~ msgstr "Kjelder"
+#: 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 "Type"
-#~ msgstr "Type:"
+msgid "All Attendees"
+msgstr "Kontaktar"
 
+#: widgets/menus/gal-view-menus.c:171
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Informasjon"
+msgid "_Current View"
+msgstr "tid no"
 
-#~ msgid "Username:"
-#~ msgstr "Brukarnamn:"
+#. 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:1060 widgets/misc/e-calendar-item.c:2755
 #, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minutt"
+msgid "%B %Y"
+msgstr "%1 %2"
 
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 #, fuzzy
-#~ msgid "Full name:"
-#~ msgstr "Fullt namn"
+msgid "Now"
+msgstr "&No"
 
-#~ msgid "Email address:"
-#~ msgstr "E-post-adresse:"
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 #, fuzzy
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil:"
-
-#~ msgid "Server:"
-#~ msgstr "Tenar:"
+msgid "%H:%M"
+msgstr "%H:%M"
 
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
 #, fuzzy
-#~ msgid "Detect supported types..."
-#~ msgstr "Vel modemtype ..."
+msgid "%H:%M:%S"
+msgstr "%H:%M"
 
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 #, fuzzy
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Slett e-post frå tenaren"
+msgid "%I:%M %p"
+msgstr "%H:%M"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
 #, fuzzy
-#~ msgid "Test Settings"
-#~ msgstr "Skriftinnstillingar"
+msgid "%I:%M:%S %p"
+msgstr "%H:%M"
 
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "E-post-&transport:"
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
 
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr " ..."
+
+#: widgets/misc/e-filter-bar.c:160
 #, fuzzy
-#~ msgid "News source type:"
-#~ msgstr "&Ny type"
+msgid "Save Search"
+msgstr "Søk"
 
+#: widgets/misc/e-filter-bar.c:231
 #, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "E-post-&transport:"
+msgid "Advanced Search"
+msgstr "Legg til ..."
 
+#: widgets/misc/e-filter-bar.c:311
 #, fuzzy
-#~ msgid "Add Identity"
-#~ msgstr " Identitet"
+msgid "Advanced ..."
+msgstr "Legg til ..."
 
+#: widgets/misc/e-messagebox.c:141
 #, fuzzy
-#~ msgid "Edit Identity"
-#~ msgstr " Identitet"
+msgid "Information"
+msgstr "Informasjon"
 
+#: widgets/misc/e-messagebox.c:148
 #, fuzzy
-#~ msgid "Add Source"
-#~ msgstr "Kjelde:"
+msgid "Warning"
+msgstr "Flyttar"
 
+#: widgets/misc/e-messagebox.c:162
 #, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Endra teneste"
+msgid "Question"
+msgstr "Skildring:"
 
+#: widgets/misc/e-messagebox.c:169
 #, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Legg til tenar"
+msgid "Message"
+msgstr "Legg til melding"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
 #, fuzzy
-#~ msgid "Edit News Server"
-#~ msgstr "R&ediger tenarar"
+msgid "Don't show this message again."
+msgstr "Sen melding"
 
+#: widgets/misc/e-search-bar.c:140
 #, fuzzy
-#~ msgid "Testing \"%s\""
-#~ msgstr "Lagar"
+msgid "Sear_ch"
+msgstr "Søk"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "The connection was successful!"
-#~ msgstr "Sambandet er brote."
+msgid "The Personal Addressbook Server"
+msgstr ""
+"Kunne ikkje starta prosess\n"
+"%1"
 
-#~ msgid "Address"
-#~ msgstr "Adresse"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
+#: wombat/wombat.c:153
 #, fuzzy
-#~ msgid "Identities"
-#~ msgstr "Identifikator"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Kunne ikkje initiere Bonobo"
 
+#: wombat/wombat.c:165
 #, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "Kjelder"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Kunne ikkje initiere Bonobo"
 
+#: wombat/wombat.c:178
 #, fuzzy
-#~ msgid "Mail Transport"
-#~ msgstr "&E-post-transport"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Kunne ikkje initiere Bonobo"
 
 #, fuzzy
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Lag meldingar og slå saman"
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Opphavsrett (c), %1 1997-2000"
 
 #, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Diskusjonsgruppetenarar"
+#~ msgid "Connecting to server"
+#~ msgstr "Sambandet er brote."
 
 #, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Kjelder"
+#~ msgid "Connect to server"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #, fuzzy
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meldingar:"
+#~ msgid "New"
+#~ msgstr "Ny ..."
 
 #, fuzzy
-#~ msgid "Delete a contact"
-#~ msgstr "Slett kolonne"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
 #, fuzzy
-#~ msgid "Find"
-#~ msgstr "Finn ..."
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Kunne ikkje initiere Bonobo"
 
-#, fuzzy
-#~ msgid "Stop Loading"
-#~ msgstr "Lagring"
+#~ msgid "Disabled"
+#~ msgstr "Deaktivert"
 
-#, fuzzy
-#~ msgid "View All"
-#~ msgstr "Vinkel"
+#~ msgid "Synchronize"
+#~ msgstr "Synkronis�r"
 
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Oppsett"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopi�r fra pilot"
 
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "&Innhald ..."
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopi�r til pilot"
 
-#, fuzzy
-#~ msgid "5 Days"
-#~ msgstr " dag"
+#~ msgid "Merge From Pilot"
+#~ msgstr "Flett fra pilot"
 
-#, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Innstillingar"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Flett til pilot"
 
 #, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Skriv ut alle"
+#~ msgid "Original Author:"
+#~ msgstr "Opprinneleg forfattar"
 
-#, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Innstillingar"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
 #, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "&Slett avtale"
+#~ msgid "Synchronize Action"
+#~ msgstr "Synkroniser"
 
 #, fuzzy
-#~ msgid "Create a new calendar"
-#~ msgstr "Feil ved opning"
-
-#~ msgid "Day"
-#~ msgstr "Dag"
+#~ msgid "Conduit state"
+#~ msgstr "&Lenkjer"
 
 #, fuzzy
-#~ msgid "Go to"
-#~ msgstr "Gå til side"
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Kan ikkje kopla til daemon"
 
 #, fuzzy
-#~ msgid "Go to a specific date"
-#~ msgstr "Gå til side"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr "Feil under opning av dette dokumentet"
 
 #, fuzzy
-#~ msgid "Go to present time"
-#~ msgstr "Ikkje vis den overskytande teksten"
-
-#~ msgid "Month"
-#~ msgstr "Månad"
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Tilgjengelege lenkjer:"
 
 #, fuzzy
-#~ msgid "Open a calendar"
-#~ msgstr "Feil ved opning"
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Øydelagd oppsettfil."
 
 #, fuzzy
-#~ msgid "Prev"
-#~ msgstr "Førehandsvising:"
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "Prioriteten må vera i området 1-99"
 
-#, fuzzy
-#~ msgid "Print this calendar"
-#~ msgstr "Skriv ut alle"
+#~ msgid "Open..."
+#~ msgstr "Opna ..."
 
 #, fuzzy
-#~ msgid "Show 1 day"
-#~ msgstr "Vis dato"
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Oppgi typen til medlemsvariabelen her."
 
 #, fuzzy
-#~ msgid "Show 1 month"
-#~ msgstr "Vis metodar"
+#~ msgid "Saving changes to message..."
+#~ msgstr "Lagrar alle endra filer ..."
 
 #, fuzzy
-#~ msgid "Show 1 week"
-#~ msgstr "Vis %1"
+#~ msgid "Save changes to message..."
+#~ msgstr "Lagrar alle endra filer ..."
 
 #, fuzzy
-#~ msgid "Show the working week"
-#~ msgstr "Vis hovudvindauget"
-
-#~ msgid "Week"
-#~ msgstr "Veke"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Rediger filterreglar"
 
 #, fuzzy
-#~ msgid "_New"
-#~ msgstr "Vis"
+#~ msgid "Add Rule"
+#~ msgstr "Legg til fil"
 
 #, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Feil ved opning"
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Rediger filterreglar"
 
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Skriv ut alle"
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Rediger filterreglar"
 
 #, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Lagra som ..."
+#~ msgid "Subject contains"
+#~ msgstr "Emne"
 
 #, fuzzy
-#~ msgid "Delete this item"
-#~ msgstr "Slett denne adressa"
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje fjerna post frå\n"
+#~ "postboksen '%1':\n"
+#~ "%2"
 
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Slett"
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #, fuzzy
-#~ msgid "Print this item"
-#~ msgstr "Skriv til fil"
+#~ msgid "Fetching email from %s"
+#~ msgstr "Hentar data frå %1"
 
 #, fuzzy
-#~ msgid "Print..."
-#~ msgstr "Skriv ut"
+#~ msgid "Fetch email from %s"
+#~ msgstr "Slett e-post frå tenaren"
 
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Lagra som ..."
+#~ msgid "Filtering email on demand"
+#~ msgstr "Ring ved førespurnad"
 
 #, fuzzy
-#~ msgid "Save and Close"
-#~ msgstr "Lagra ei fil"
+#~ msgid "Filter email on demand"
+#~ msgstr "Ring ved førespurnad"
 
 #, fuzzy
-#~ msgid "See online help"
-#~ msgstr "Me er tilkopla!"
+#~ msgid "Sending queue"
+#~ msgstr "&Send meldingane i køen"
 
 #, fuzzy
-#~ msgid "_File"
-#~ msgstr "Fil"
+#~ msgid "Send queue"
+#~ msgstr "&Send meldingane i køen"
 
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Skriv ut"
+#~ msgid "Appending \"%s\""
+#~ msgstr "Sender %1"
 
 #, fuzzy
-#~ msgid "_Save"
-#~ msgstr "Lagra"
+#~ msgid "Appending a message without a subject"
+#~ msgstr "Sender meldingar til %1"
 
 #, fuzzy
-#~ msgid "About..."
-#~ msgstr "Skrifttype ..."
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Teikn"
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Klipp ut"
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Flytta alle meldingar til papirkorga"
 
 #, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Teikn"
+#~ msgid "(No description)"
+#~ msgstr "Inga skildring"
 
 #, fuzzy
-#~ msgid "Clear the selection"
-#~ msgstr "Slettar den valte fila"
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Les mapper"
 
 #, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "&Slett avtale"
-
-#~ msgid "Copy"
-#~ msgstr "Kopier"
-
-#~ msgid "Cut"
-#~ msgstr "Klipp ut"
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Endra mappe"
 
 #, fuzzy
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "Adresse&bok ..."
+#~ msgid ""
+#~ "Error while preparing to %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil ved lesing av fil:\n"
+#~ "%s"
 
 #, fuzzy
-#~ msgid "FIXME: Help"
-#~ msgstr "&KDE-hjelp"
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil ved laging av fil '%1':\n"
+#~ "%2"
 
 #, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "Sett inn fil ..."
+#~ msgid "Could not create dialog box."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
 
 #, fuzzy
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Repetering"
+#~ msgid "User cancelled query."
+#~ msgstr ""
+#~ "Brukaren avbraut handling\n"
+#~ "%1"
 
 #, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Linjeeigenskapar"
+#~ msgid "Examining %s"
+#~ msgstr "Forventar %1"
 
 #, fuzzy
-#~ msgid "N_ext"
-#~ msgstr "Neste"
-
-#~ msgid "Paste"
-#~ msgstr "Lim inn"
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Limer inn ..."
+#~ msgid "Writing message %d of %d"
+#~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "Previous"
-#~ msgstr "Førre"
+#~ msgid "Saving changes to %s"
+#~ msgstr "Lagrar alle endra filer ..."
 
 #, fuzzy
-#~ msgid "Print Setup"
-#~ msgstr "Speloppsett"
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje fjerna post frå\n"
+#~ "postboksen '%1':\n"
+#~ "%2"
 
 #, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Eigenskapar ..."
+#~ msgid "Subscribe to folder \"%s\""
+#~ msgstr "Lag ny mappe i %1"
 
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Tilfeldig"
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "Redo the undone action"
-#~ msgstr "Fjern ein kolonne"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "Avtale"
 
 #, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Svar"
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "Elementstil"
 
 #, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "tid no"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "&Førehandsvising ..."
 
 #, fuzzy
-#~ msgid "Schedule Meeting"
-#~ msgstr "Køyreplan ..."
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "Smarte vedlegg"
 
 #, fuzzy
-#~ msgid "Schedule _Meeting"
-#~ msgstr "Køyreplan ..."
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "Flytt til mappe"
 
 #, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Vel mappe"
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "Kopier til mappe"
 
 #, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Vel mappe"
+#~ msgid "Page Set_up"
+#~ msgstr "Speloppsett"
 
 #, fuzzy
-#~ msgid "_About..."
-#~ msgstr "Skrifttype ..."
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "&Førehandsvising ..."
 
 #, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Lukk"
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "Lim inn spesiell ..."
 
 #, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Kopier"
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "Mar&ker som ulesen"
 
 #, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Rediger"
+#~ msgid "_Object"
+#~ msgstr "Objekt"
 
 #, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Finn ..."
+#~ msgid "FIXME: _Standard"
+#~ msgstr "Standard"
 
 #, fuzzy
-#~ msgid "_Help"
-#~ msgstr "Heim"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "Tekstformatering"
 
 #, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Lim inn"
+#~ msgid "_Toolbars"
+#~ msgstr "Verktøylinjer"
 
 #, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Skriv ut"
+#~ msgid "FIXME: _File..."
+#~ msgstr "Sett inn fil ..."
 
 #, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Eigenskapar ..."
+#~ msgid "FIXME: _Object..."
+#~ msgstr "&Objekt ..."
 
 #, fuzzy
-#~ msgid "_Redo"
-#~ msgstr "Tilfeldig"
+#~ msgid "FIXME: _Font..."
+#~ msgstr "Skrifttype ..."
 
 #, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "Opna ..."
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "&Avsnitt ..."
 
 #, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Lukk"
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "&Stavekontroll ..."
 
 #, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Lukk melding"
+#~ msgid "_Forms"
+#~ msgstr "Forum"
 
 #, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "&Kopier bileteplassering"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "&Stavekontroll ..."
 
 #, fuzzy
-#~ msgid "F_older"
-#~ msgstr "Mapper"
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "Ny oppgåve"
 
 #, fuzzy
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "Fil under:"
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "Kopier til mappe"
 
 #, fuzzy
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "Skriv ut filer"
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "&Stavekontroll ..."
 
 #, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "Detaljar"
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "Fort framover"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Neste melding"
+#~ msgid "FIXME: For_ward"
+#~ msgstr "Fort framover"
 
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Vidaresendt melding frå %1"
+#~ msgid "FIXME: Previous"
+#~ msgstr "Førre"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Sentrer dei valte elementa"
+#~ msgid "FIXME: Next"
+#~ msgstr "Finn neste"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "E-post:"
+#~ msgid "Group %i"
+#~ msgstr "Gruppe %1"
 
 #, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Skildring:"
+#~ msgid "label26"
+#~ msgstr "Etikett"
 
 #, fuzzy
-#~ msgid "Mark As U_nread"
-#~ msgstr "Mar&ker som ulesen"
+#~ msgid "C_lassification:"
+#~ msgstr "&Forstørring"
 
 #, fuzzy
-#~ msgid "Move"
-#~ msgstr "Mån"
+#~ msgid "S_ummary"
+#~ msgstr "Samandrag"
 
 #, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Lagra side til ascii-fil"
+#~ msgid "Days"
+#~ msgstr "Dag"
 
 #, fuzzy
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Sen melding"
+#~ msgid "Hours"
+#~ msgstr "time/timar"
 
 #, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "&Førehandsvising ..."
+#~ msgid "Mail _to:"
+#~ msgstr "E-post:"
 
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Private meldingar"
+#~ msgid "Minutes"
+#~ msgstr "minutt"
 
-#, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Svar til alle:"
+#~ msgid "Time"
+#~ msgstr "Tid"
 
 #, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Svar til avsendar:"
+#~ msgid "_Audio"
+#~ msgstr "Lyd"
 
 #, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Vel mappe"
+#~ msgid "_Mail"
+#~ msgstr "Send"
 
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Vidaresendt melding frå %1"
+#~ msgid "_Program"
+#~ msgstr "Program"
 
 #, fuzzy
-#~ msgid "Threaded Message list"
-#~ msgstr "Vidaresendt melding frå %1"
+#~ msgid "event-editor-dialog"
+#~ msgstr "Opnar angrehistoriedialogen"
 
 #, fuzzy
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Mappenamn:"
+#~ msgid "label21"
+#~ msgstr "Etikett"
 
 #, fuzzy
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "Mappa finst: "
+#~ msgid "Hide deleted"
+#~ msgstr "Slett"
 
 #, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Kopier til mappe"
+#~ msgid "Hide Subject"
+#~ msgstr "Emne"
 
 #, fuzzy
-#~ msgid "_Edit Message"
-#~ msgstr "Legg til melding"
+#~ msgid "Hide from Sender"
+#~ msgstr "Fil under:"
 
 #, fuzzy
-#~ msgid "_Filter on Subject"
-#~ msgstr "Ingen emne"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Emne"
 
 #, fuzzy
-#~ msgid "_Forward"
-#~ msgstr "Fram"
+#~ msgid "Account Properties"
+#~ msgstr "Vedleggseigenskapar"
 
 #, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Oppsett"
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-post-adresse:"
 
 #, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Legg til melding"
+#~ msgid "Reply-to:"
+#~ msgstr "Svar"
 
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Flytt til mappe"
+#~ msgid "Full name:"
+#~ msgstr "Fullt namn"
 
 #, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "&Opna i eige vindauge"
+#~ msgid "Signature File"
+#~ msgstr "Signaturfil:"
 
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Private meldingar"
+#~ msgid "Server:"
+#~ msgstr "Tenar:"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Lagra melding"
+#~ msgid "Detect supported types..."
+#~ msgstr "Vel modemtype ..."
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Kjelder"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Slett e-post frå tenaren"
 
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Slett"
+#~ msgid "Mail source type:"
+#~ msgstr "E-post-&transport:"
 
 #, fuzzy
-#~ msgid "_VFolder on Subject"
-#~ msgstr "Ingen emne"
+#~ msgid "News source type:"
+#~ msgstr "&Ny type"
 
 #, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Mapper"
+#~ msgid "Mail transport type:"
+#~ msgstr "E-post-&transport:"
 
 #, fuzzy
-#~ msgid "Attach"
-#~ msgstr "&Legg ved"
+#~ msgid "Add Identity"
+#~ msgstr " Identitet"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "tid no"
+#~ msgid "Edit Identity"
+#~ msgstr " Identitet"
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Lagra melding"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
+#~ msgid "Edit Source"
+#~ msgstr "Endra teneste"
 
 #, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Oppgi eit nytt namn på meldinga."
+#~ msgid "Add News Server"
+#~ msgstr "Legg til tenar"
 
 #, fuzzy
-#~ msgid "Insert text file..."
-#~ msgstr "Sett inn fil ..."
+#~ msgid "Edit News Server"
+#~ msgstr "R&ediger tenarar"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Opna fil"
+#~ msgid "Testing \"%s\""
+#~ msgstr "Lagar"
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Lagra"
+#~ msgid "The connection was successful!"
+#~ msgstr "Sambandet er brote."
 
 #, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Lagrar fil ..."
+#~ msgid "Identities"
+#~ msgstr "Identifikator"
 
 #, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Lagrar fil ..."
+#~ msgid "Mail Sources"
+#~ msgstr "Kjelder"
 
 #, fuzzy
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Sender ei melding til ein nettverksspelar"
+#~ msgid "Mail Transport"
+#~ msgstr "&E-post-transport"
 
 #, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Lagra side til ascii-fil"
+#~ msgid "News Servers"
+#~ msgstr "Diskusjonsgruppetenarar"
 
-#~ msgid "Send"
-#~ msgstr "Send"
+#, fuzzy
+#~ msgid "News Sources"
+#~ msgstr "Kjelder"
 
 #, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Send &seinare"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Oppsett"
 
 #, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Send &seinare"
+#~ msgid "Ca_lendar"
+#~ msgstr "Skriv ut alle"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Sen melding"
+#~ msgid "Open a calendar"
+#~ msgstr "Feil ved opning"
 
 #, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Sen melding"
+#~ msgid "_Print this calendar"
+#~ msgstr "Skriv ut alle"
 
 #, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Sen melding"
+#~ msgid "FIXME: Help"
+#~ msgstr "&KDE-hjelp"
 
 #, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Vedlegg som ikon"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "Sett inn fil ..."
 
 #, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "Vedlegg"
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "Repetering"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Sender meldingar til %1"
+#~ msgid "_Find..."
+#~ msgstr "Finn ..."
 
 #, fuzzy
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "Sett inn fil ..."
+#~ msgid "_Redo"
+#~ msgstr "Tilfeldig"
 
 #, fuzzy
-#~ msgid "_Open..."
+#~ msgid "_Replace..."
 #~ msgstr "Opna ..."
 
 #, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Avslutt"
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Fil under:"
 
 #, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evalueringsfeil"
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Skriv ut filer"
 
 #, fuzzy
-#~ msgid "Getting _Started"
-#~ msgstr "Starta"
+#~ msgid "Mark As U_nread"
+#~ msgstr "Mar&ker som ulesen"
 
 #, fuzzy
-#~ msgid "Using the _Calendar"
-#~ msgstr "Skriv ut alle"
+#~ msgid "Print Preview of message..."
+#~ msgstr "&Førehandsvising ..."
 
 #, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Oppløysing"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Svar til avsendar:"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Avtale"
+#~ msgid "_Filter on Subject"
+#~ msgstr "Ingen emne"
+
+#, fuzzy
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Oppsett"
 
 #, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "Comment=X-redigering"
+#~ msgid "_Open in New Window"
+#~ msgstr "&Opna i eige vindauge"
 
 #, fuzzy
-#~ msgid "_Folder"
-#~ msgstr "Mapper"
+#~ msgid "_Print Message"
+#~ msgstr "Private meldingar"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Flytt til mappe"
+#~ msgid "_Save Message As..."
+#~ msgstr "Lagra melding"
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "Set inn"
+#~ msgid "_Source"
+#~ msgstr "Kjelder"
 
 #, fuzzy
-#~ msgid "_Settings"
-#~ msgstr "Skriftinnstillingar"
+#~ msgid "_VFolder on Subject"
+#~ msgstr "Ingen emne"
 
 #, fuzzy
 #~ msgid "Available Categories:"
@@ -6952,14 +9508,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Overskrift:"
 
 #, fuzzy
-#~ msgid "Empty days:"
-#~ msgstr " dag"
-
-#, fuzzy
-#~ msgid "Appointments:"
-#~ msgstr "Avtale"
-
-#, fuzzy
 #~ msgid "Highlighted day:"
 #~ msgstr "Opplysing:"
 
@@ -6980,10 +9528,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Mai"
 
 #, fuzzy
-#~ msgid "sept"
-#~ msgstr "Nullstill"
-
-#, fuzzy
 #~ msgid "sunday"
 #~ msgstr "Sundag"
 
@@ -7114,10 +9658,6 @@ msgstr "Gruppe %1"
 #~ msgstr "E-posttenar"
 
 #, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Lagra: %s"
-
-#, fuzzy
 #~ msgid "Send a message without a subject"
 #~ msgstr "Sender ei melding til ein nettverksspelar"
 
@@ -7146,10 +9686,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Melding frå %s"
 
 #, fuzzy
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Markerer meldingar"
-
-#, fuzzy
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "advarsel: denne meldinga er ikkje brukt"
 
@@ -7194,10 +9730,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Vis meldingstorleik"
 
 #, fuzzy
-#~ msgid "Clear message display"
-#~ msgstr "Endra tidsvising"
-
-#, fuzzy
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Mottek meldingar frå %1"
 
@@ -7218,10 +9750,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Mottek meldingar frå %1"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Mottek meldingar frå %1"
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Mottek meldingar frå %1"
 
@@ -7238,10 +9766,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Diskusjonsgruppetenarar"
 
 #, fuzzy
-#~ msgid "_Actions"
-#~ msgstr "Handlingar"
-
-#, fuzzy
 #~ msgid "_Save Calendar As"
 #~ msgstr "Ny kalender"
 
@@ -7249,28 +9773,14 @@ msgstr "Gruppe %1"
 #~ msgstr "(C) 1998 the Free Software Foundation"
 
 #, fuzzy
-#~ msgid "Could not start addressbook server"
-#~ msgstr ""
-#~ "Kunne ikkje starta prosess\n"
-#~ "%1"
-
-#, fuzzy
 #~ msgid "Error while communicating with address server"
 #~ msgstr "Feil ved tilkopling til tenar."
 
 #, fuzzy
-#~ msgid "_Street Address:"
-#~ msgstr "Gateadresse"
-
-#, fuzzy
 #~ msgid "window2"
 #~ msgstr "Vindauge"
 
 #, fuzzy
-#~ msgid "* Click here to add a contact *"
-#~ msgstr "Trykk her for å leggja til ein ny virtuell vert."
-
-#, fuzzy
 #~ msgid "Could not start gnomecal server"
 #~ msgstr ""
 #~ "Kunne ikkje starta prosess\n"
@@ -7285,10 +9795,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Vis topptekst"
 
 #, fuzzy
-#~ msgid "FIXME: S_kip Occurrence"
-#~ msgstr "Førekomst"
-
-#, fuzzy
 #~ msgid "FIXME: Reply to A_ll"
 #~ msgstr "Svar til alle:"
 
@@ -7382,10 +9888,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Dato-område"
 
 #, fuzzy
-#~ msgid "Day start:"
-#~ msgstr " start"
-
-#, fuzzy
 #~ msgid "Day end:"
 #~ msgstr "Dag:"
 
@@ -7410,10 +9912,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Rammeeigenskapar ..."
 
 #, fuzzy
-#~ msgid " seconds"
-#~ msgstr "sekund"
-
-#, fuzzy
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Kopierer utvalet til utklippstavla"
 
diff --git a/po/no.po b/po/no.po
index d9e391cbaf..b5ac214d14 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-03-13 00:10-0500\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-03-13 00:18-05:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -406,7 +406,7 @@ msgid "Phone Types"
 msgstr "Telefontyper"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -497,109 +497,109 @@ msgstr "De_tte er postadressen"
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten h�rer til disse kategoriene:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Faks p� arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Persons�ker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Prim�r"
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-post 3"
@@ -816,7 +816,7 @@ msgid "None (anonymous mode)"
 msgstr "Ingen (anonym modus)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -945,7 +945,7 @@ msgstr "Adressebok-kilder"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1457,7 +1457,7 @@ msgstr "Konfidensiell"
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -2252,7 +2252,7 @@ msgid "New Appointment..."
 msgstr "Ny avtale..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "�pne"
@@ -3023,7 +3023,7 @@ msgstr "Dette �ret (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
 #: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
@@ -3090,7 +3090,7 @@ msgstr "Feil under kj�ring av filter: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filters�k: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3099,7 +3099,7 @@ msgstr ""
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3108,16 +3108,16 @@ msgstr ""
 "Feil under kj�ring av s�keuttrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utf�rer sp�rring p� ukjent header: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i kropp-inneholder, forventer streng"
 
@@ -3197,47 +3197,47 @@ msgstr "Movemail-programmet feilet: %s"
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Opreasjon avbrutt"
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet."
 
@@ -3340,7 +3340,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar p� autentisering fra tjener."
 
@@ -3394,12 +3394,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en sp�rring p� et annet sett med mapper"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3429,7 +3429,7 @@ msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen slik melding: %s"
@@ -3484,34 +3484,44 @@ 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:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "For lesing og lagring av e-post p� IMAP-tjenere."
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:407
+#: camel/providers/imap/camel-imap-store.c:415
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3522,7 +3532,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
@@ -3928,6 +3938,21 @@ msgstr ""
 "e-post fra enkelte e-posttilbydere via web i tillegg til propriet�re "
 "e-postsystemer."
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"For tilkobling til POP-tjenere. POP-protokollen kan ogs� brukes for � hente "
+"e-post fra enkelte e-posttilbydere via web i tillegg til propriet�re "
+"e-postsystemer."
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -4000,7 +4025,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
@@ -4052,11 +4077,11 @@ msgstr "sendmail avsluttet med status %d: melding ikke sendt."
 msgid "Could not find 'From' address in message"
 msgstr "Kunne ikke finne 'Fra'-adresse i melding"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
@@ -4068,121 +4093,132 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar p� systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullf�rt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst pr�v <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utf�rt: utilstrekkelig lagringsplass"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utf�rt: postboksnavn ikke tillatt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr "Passordoverf�ring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, 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:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Ingen autentisering n�dvendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4190,106 +4226,106 @@ 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:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, 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:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, 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:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, 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:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, 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:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Feil ved \"RCPT TO\"-svar: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, 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:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, 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:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, 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:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Feil ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, 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:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Feil ved QUIT-svar: %s: ikke-fatal"
@@ -4377,33 +4413,40 @@ msgid "From:"
 msgstr "Fra:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 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:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4434,12 +4477,12 @@ msgstr "Feil under lagring av fil: %s"
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4449,27 +4492,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "�pne fil"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 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:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4477,15 +4520,15 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker p� at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -4501,6 +4544,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Gruppevaresuiten Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adressekort"
@@ -4835,29 +4882,20 @@ msgstr "n�"
 msgid "<click here to select a date>"
 msgstr "<klikk her for � velge en dato>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "Legg til filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redig�r filterregel"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redig�r filtre"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "S�"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Fjern handling"
 
@@ -4894,35 +4932,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Utf�r handlinger"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�tt"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�tt"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
@@ -4940,14 +4978,14 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Redig�r filtre"
+
 #: 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"
@@ -4956,7 +4994,7 @@ msgstr "Innkommende"
 msgid "Outgoing"
 msgstr "Utg�ende"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -5149,36 +5187,25 @@ msgstr "var etter"
 msgid "was before"
 msgstr "var f�r"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Legg til regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Rediger poengregel"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Legg til regel for VFolder"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redig�r VFolder regel"
-
-#: mail/component-factory.c:304
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:377
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-factory.c:214
+#: mail/folder-browser-factory.c:237
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for \"%s\""
 
-#: mail/folder-browser-factory.c:216 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Egenskaper"
@@ -5187,81 +5214,81 @@ msgstr "Egenskaper"
 msgid "Store search as vFolder"
 msgstr "Lagre s�k som vMappe"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "VFolder p� e-postliste"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtr�r etter emne"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtr�r etter sender"
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtr�r etter mottaker"
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtr�r etter e-postliste"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
 #: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Mark�r som lest"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopi�r til mappe..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Angre slett"
 
@@ -5269,20 +5296,20 @@ msgstr "Angre slett"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r etter e-postliste (%s)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder p� e-postliste (%s)"
@@ -5319,22 +5346,6 @@ msgstr "Factory for Evolution e-post komponent."
 msgid "Factory for the Mail Summary component."
 msgstr "Factory for e-post sammendrag komponent."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factory for � importere Outlook Express 4-meldinger til Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Factory for � importere mbox til Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importerer Outlook Express 4-filer til Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importerer mbox-filer til Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktivt lagringsformat:"
@@ -5423,6 +5434,10 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Legg til filterregel"
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5516,7 +5531,7 @@ msgstr "Lagre melding som..."
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5525,11 +5540,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -5784,7 +5799,7 @@ msgstr ""
 "Klikk \"Neste\" for � begynne."
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "R_edig�r"
@@ -5860,10 +5875,6 @@ msgstr "Skjul"
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
 #: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
@@ -5988,15 +5999,15 @@ msgstr ""
 "Feil under utf�ring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-mt.c:666 mail/session.c:90
+#: mail/mail-mt.c:666 mail/session.c:91
 msgid "Do you accept?"
 msgstr "Aksepterer du?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Evolution fremgang"
 
@@ -6186,7 +6197,9 @@ msgstr "Videresendt melding (uten emne)"
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
 "%s<br><b>Subject:</b> %s<br>"
-msgstr "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %s<br><b>Emne:</b> %s<br>"
+msgstr ""
+"-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> "
+"%s<br><b>Emne:</b> %s<br>"
 
 #: mail/mail-vfolder.c:248
 msgid "VFolders"
@@ -6651,7 +6664,7 @@ msgstr "%s - Evolution - %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6738,7 +6751,7 @@ msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vis"
@@ -6799,8 +6812,8 @@ msgstr "Spesifisert type er ikke st�ttet for dette lageret"
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6837,7 +6850,7 @@ msgstr ""
 "Vi h�per at du nyter resultatene av v�rt harde arbeid, og vi venter i\n"
 "spenning p� at du tilbyr din hjelp!\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6845,15 +6858,15 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Sl� av."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -7099,13 +7112,13 @@ msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Lagre"
@@ -7244,7 +7257,7 @@ msgid "Print Setup"
 msgstr "Skriveroppsett"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Lagre"
 
@@ -7281,12 +7294,12 @@ msgstr "Redig�r sideinnstillinger for aktiv skriver"
 msgid "Task _Request (FIXME)"
 msgstr "_Oppgaveforesp�rsel"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Om..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "L_ukk"
@@ -7300,12 +7313,12 @@ msgstr "_Kontakt"
 msgid "_Copy"
 msgstr "_Kopi�r"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Feils�k"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Hjelp"
@@ -7726,31 +7739,41 @@ msgstr "Sl� av/p� visning av CC-feltet"
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Sl� av/p� visning av Fra-feltet"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Sl� av/p� visning av CC-feltet"
+
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_�pne..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Svar-til:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Sikkerhet"
 
@@ -8133,15 +8156,15 @@ msgstr "Tide er gyldig"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Avansert s�k"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Avansert..."
 
@@ -8190,9 +8213,29 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Gruppevaresuiten Evolution"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Redig�r filterregel"
+
+#~ msgid "Add Rule"
+#~ msgstr "Legg til regel"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Legg til regel for VFolder"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Redig�r VFolder regel"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Factory for � importere Outlook Express 4-meldinger til Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Factory for � importere mbox til Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importerer Outlook Express 4-filer til Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importerer mbox-filer til Evolution"
 
 #~ msgid "Disabled"
 #~ msgstr "Sl�tt av"
diff --git a/po/sk.po b/po/sk.po
index 03aef2b9b5..8afea49ccf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,11 +1,10 @@
 # evolution Slovak translation.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001.
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-02 16:28+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-03-02 16:42CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -313,131 +312,13 @@ msgstr "Importuje s�bory GnomeCard do Evolution"
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nie je mo�n� inicializova� Bonobo"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Zak�zan�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronizova�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kop�rova� z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kop�rova� do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Spoji� z Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Spoji� do Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "P�vodn� autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Spojka pre adres�r Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigura�n� n�stroj pre spojku adres�ra Evolution.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Akcia Synchronizova�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stav spojky"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nie je nastaven� �iadny pilot, pros�m,\n"
-"najprv pou�ite 'Vlastnosti spojenia Pilota'."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nespojen� s d�monom gnome-pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Nastala chyba pri pokuse o z�skanie\n"
-"zoznamu pilotov od d�mona gnome-pilot"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Kurzor nie je mo�n� na��ta�\n"
@@ -467,7 +348,7 @@ msgstr "Nie je mo�n� pre��ta� blok aplik�cie Adresa z pilota"
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Prida�"
 
@@ -508,7 +389,7 @@ msgstr "Ulo�i� ako:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "V�eobecn�"
 
@@ -525,7 +406,7 @@ msgid "Phone Types"
 msgstr "Typy telef�nov"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Prim�rny e-mail"
 
@@ -538,6 +419,7 @@ msgid "Web page address:"
 msgstr "Adresa WWW str�nky:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "_Prida�"
 
@@ -562,8 +444,8 @@ msgid "_Company:"
 msgstr "_Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Odstr�ni�"
 
@@ -615,113 +497,132 @@ msgstr "_Toto je e-mailov� adresa"
 msgid "Delete Contact?"
 msgstr "Odstr�ni� kontakt?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patr� do t�chto kateg�ri�:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1188
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1189
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Pr�ca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Pr�ca 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1191
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Pracovn� fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1192
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Sp�tn� volanie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Dom�ci fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "In�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "�al�� fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Prim�rny"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-mail 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Upravi� filtre"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Cel� meno:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -917,9 +818,9 @@ msgid "None (anonymous mode)"
 msgstr "�iadny (anonymn� m�d)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Heslo"
 
@@ -960,7 +861,7 @@ msgid "Remember this password"
 msgstr "Ulo�i� toto heslo"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Hostite�:"
 
@@ -989,12 +890,12 @@ msgid "Search Scope:"
 msgstr "Oblas� h�adania:"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Overenie:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:497 mail/mail-config.glade.h:52
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Cesta:"
 
@@ -1021,7 +922,7 @@ msgid ""
 msgstr "Vyberte typ adres�ra, ktor� m�te, a zadajte po�adovan� inform�cie."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1046,16 +947,16 @@ msgstr "Zdroje adres�ra"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:535
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Odstr�ni�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:521 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Upravi�"
 
@@ -1068,31 +969,47 @@ msgstr "Meno"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "In� kontakty"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "Uk�kov� ovl�dac� prvok Bonobo, ktor� zobrazuje adres�r."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Uk�kov� ovl�dac� prvok Bonobo, ktor� zobrazuje adres�r."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Ovl�dac� prvok pre zobrazenie minikariet adres�ra Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Prehliada� minikariet adres�ra Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution pre pr�cu s kontaktami."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Vytv�racie rozhranie pre ovl�dac� prvok minikariet adres�ra."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Vytv�racie rozhranie pre komponent adres�ra Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Adres�r"
 
@@ -1104,6 +1021,21 @@ msgstr "Rozhranie pre v�ber mena adres�ra Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Vytv�racie rozhranie pre rozhranie pre v�ber mena adres�ra."
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Odstr�ni�"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Odstr�ni�"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "N�js�..."
@@ -1311,6 +1243,11 @@ msgstr ""
 "\n"
 "Dvojit�m kliknut�m vytvor�te nov� kontakt."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#, fuzzy
+msgid "Card View"
+msgstr "Karta: "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bd. Tahoma"
@@ -1468,7 +1405,7 @@ msgstr "Meno �t�lu:"
 msgid "Top:"
 msgstr "Vrchn�:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:77
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
@@ -1476,18 +1413,6 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "��rka:"
 
-#: 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 "Spojka kalend�ra Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "N�stroj pre nastavenie spojky pre kalend�r Evolution.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1498,33 +1423,11 @@ msgstr "Chyba pri komunik�cii s kalend�rov�m serverom"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Spojka ToDo pre Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "N�stroj pre nastavenie spojky pre todo Evolution.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie ToDo pilota"
 
-#: 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 "Pripomen�� sch�dzku o "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Opakova�"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
 #: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "S�bor nen�jden�"
@@ -1537,74 +1440,114 @@ msgstr "Otvori� kalend�r"
 msgid "Save calendar"
 msgstr "Ulo�i� kalend�r"
 
-#: calendar/gui/calendar-commands.c:444
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:451
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je mo�n� vytvori� kalend�rov� poh�ad. Pros�m, overte nastavenie ORBit a "
 "OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: 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"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-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:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Verejn�"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "S�kromn�"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Tajn�"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1590 calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Nezn�my"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Vysok�"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Norm�lny"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "N�zka"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Priesvitn�"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Neprieh�adn�"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Neza�al"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "Prebieha"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Dokon�en�"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Zru�en�"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1615,36 +1558,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: 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"
-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:895
-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:898
-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:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "�iadna"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1654,32 +1585,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentu�lna hodnota mus� by� medzi 0 a� 100"
 
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Priorita mus� by� medzi 1 a� 9"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Norm�lny"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Nedefinovan�"
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Priraden�"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "�no"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nie"
 
@@ -1719,6 +1656,41 @@ msgstr "Na��tavam kalend�r"
 msgid "The URI that the calendar will display"
 msgstr "URI, ktor� bude kalend�r zobrazova�"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Pripomen�� sch�dzku o "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Opakova�"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Vytv�racie rozhranie pre editor spr�v Evolution."
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "Nie je mo�n� inicializova� GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Poplach o %A %b %d %Y %H:%M"
@@ -1787,7 +1759,7 @@ msgid "Beep when alarm windows appear."
 msgstr "P�pnu� pri zobrazen� okna alarmu."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalend�r"
 
@@ -1816,7 +1788,7 @@ msgid "Display options"
 msgstr "Mo�nosti zobrazenia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Term�n"
 
@@ -1883,8 +1855,7 @@ msgid "Pick a color"
 msgstr "Vyberte farbu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Priorita"
 
@@ -2027,45 +1998,22 @@ msgstr "Chcete ulo�i� zmeny?"
 msgid "% Comp_lete:"
 msgstr "% _Hotov�ch:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Zru�en�"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klasifik�cia"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Dokon�en�"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date &amp; Time"
+#, fuzzy
+msgid "Date & Time"
 msgstr "D�tum a �as"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Date Completed:"
 msgstr "D�tum dokon�enia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Vysok�"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "Prebieha"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "N�zka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Neza�al"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2097,10 +2045,6 @@ msgstr "�loha"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Nedefinovan�"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2146,72 +2090,128 @@ msgstr "�loha - %s"
 msgid "Journal entry - %s"
 msgstr "Polo�ka denn�ku - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Kateg�rie"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "D�tum dokon�enia"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "D�tum konca"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "D�tum �tartu"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geografick� umiestnenie"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Percent complete"
 msgstr "Hotov�ch percent"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "S�hrn"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Priesvitnos�"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Kliknut�m prid�te �lohu"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Ozna�i� ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Ozna�� �lohu ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "Upravi� t�to �lohu..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "Upravi� �lohu"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Odstr�ni� t�to �lohu"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Odstr�ni� �lohu"
 
@@ -2222,68 +2222,72 @@ msgstr "%02i rozdelen� min�ty"
 
 #. 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: 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:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "popoludn�"
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nov� sch�dzka..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Napl�nova� stretnutie"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Upravi� t�to sch�dzku..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Otvori�"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Odstr�ni� t�to sch�dzku"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Napl�nova� stretnutie"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
 msgstr "Nastavi� t�to sch�dzku ako presunute�n�"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
 msgstr "Odstr�ni� tento v�skyt"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
 msgstr "Odstr�ni� v�etky v�skyty"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2380,8 +2384,7 @@ msgstr "Na��tavam kalend�r..."
 msgid "Organizer:"
 msgstr "Organiz�tor:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Odosielate�"
 
@@ -2473,26 +2476,26 @@ msgstr ""
 "Napl�nova�\n"
 "�as"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Stav"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "V�etky"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Kateg�ria:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa na��ta� �lohy v `%s'"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
@@ -2504,6 +2507,11 @@ msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
 msgid "%d %B"
 msgstr "%d %B"
 
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Odstr�ni� v�etky v�skyty"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Celodenn� udalos�"
@@ -2567,7 +2575,7 @@ msgstr "Spusti� program"
 msgid "Send an email"
 msgstr "Posla� e-mail"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Nastavenie..."
 
@@ -2592,14 +2600,12 @@ msgstr "�as _za�iatku:"
 msgid "_Starting date:"
 msgstr "D�tum _za�iatku:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "pred"
 
@@ -2624,34 +2630,26 @@ msgid "hour(s)"
 msgstr "hod�n"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "min�t"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mesiaca/ov"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "za�iatok sch�dzky"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "pok�m"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "t��d�ov"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "rokov"
 
@@ -2744,8 +2742,8 @@ msgstr " pred koncom sch�dzky"
 msgid " after end of appointment"
 msgstr " po konci sch�dzky"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2781,12 +2779,12 @@ msgstr "Vytv�racie rozhranie pre ovl�dac� prvok poh�adu iTip kalend�ra"
 msgid "Factory for the sample Calendar control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Kalend�r."
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je mo�n� otvori� prie�inok v `%s'"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Met�da nutn� k otvoreniu `%s' nie je podporovan�"
@@ -2847,199 +2845,197 @@ msgstr "Okt�ber"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "Nie je mo�n� inicializova� GNOME"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "�t"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "�lohy"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Tento t��de� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Tento rok (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Tla�i� kalend�r"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1237
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Uk�ka pred tla�ou"
 
@@ -3047,6 +3043,34 @@ msgstr "Uk�ka pred tla�ou"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktor� bude zobrazova� prie�inok �loh"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "NPUS�PS"
@@ -3066,7 +3090,7 @@ msgstr "Chyba pri vykon�van� filtra: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykon�van� h�adania filtra: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3075,7 +3099,7 @@ msgstr ""
 "Nie je mo�n� spracova� h�adac� v�raz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3084,16 +3108,16 @@ msgstr ""
 "Chyba pri vykon�van� h�adacieho v�razu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(odpoved� v�etk�mu) vy�aduje jeden pravdivostn� v�sledok"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie ot�zky na nezn�mej hlavi�ke: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neplatn� typ v body-contains, o�ak�vam re�azec"
 
@@ -3173,51 +3197,51 @@ msgstr "Program movemail zlyhal: %s"
 msgid "(Unknown error)"
 msgstr "(Nezn�ma chyba)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je mo�n� na��ta� %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je mo�n� na��ta� %s: V module nie je inicializa�n� k�d."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s slu�ba pre %s na %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Spojenie zru�en�"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je mo�n� spojenie s %s (port %d): %s"
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(nezn�my hostite�)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Oper�cia zru�en�"
 
-#: camel/camel-remote-store.c:543
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "Server neo�ak�vane zru�il spojenie"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:73
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
 msgid "Authentication failed."
 msgstr "Overenie zlyhalo."
 
@@ -3248,9 +3272,7 @@ msgstr ""
 "Neplatn� inform�cia krokovania:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3258,7 +3280,48 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje server."
+msgstr ""
+"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Odpove� serveru skon�ila pr�li� skoro."
 
 #: camel/camel-sasl-kerberos4.c:38
 msgid "Kerberos 4"
@@ -3278,10 +3341,23 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:378
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Neplatn� odpove� na overenie od serveru."
 
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"T�to vo�ba v�s pripoj� k serveru pomocou hesla CRAM-MD5, ak ho podporuje "
+"server."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3320,12 +3396,12 @@ msgstr "Poskytovate� po�ty pre virtu�lny prie�inok"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre ��tanie po�ty ako ot�zky na in� mno�inu prie�inkov"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispoz�cii poskytovate�"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3334,6 +3410,13 @@ msgstr ""
 "Nie je mo�n� vytvori� prie�inok %s:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "�loha"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3349,6 +3432,11 @@ msgstr "Re�azec URL `%s' obsahuje neplatn� protokol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "��slo portu v URL `%s' nie je ��slo"
 
+#: camel/camel-vee-folder.c:960
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Tak� spr�va neexistuje"
+
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3399,16 +3487,45 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
+msgstr ""
+"T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
+
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Overenie nie je vy�adovan�"
+
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3419,7 +3536,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:752
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je mo�n� vytvori� prie�inok %s: %s"
@@ -3654,7 +3771,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie je mo�n� vytvori� s�hrn: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1311
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synchronizujem prie�inok"
 
@@ -3823,7 +3940,22 @@ msgstr ""
 "po�ty od r�znych poskytovate�ov po�ty pomocou WWW a propriet�rnymi po�tov�mi "
 "syst�mami."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Pre spojenie s POP serverami. Protokol POP je mo�n� pou�i� aj pre z�skavanie "
+"po�ty od r�znych poskytovate�ov po�ty pomocou WWW a propriet�rnymi po�tov�mi "
+"syst�mami."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3831,7 +3963,7 @@ msgstr ""
 "T�to vo�ba v�s spoj� s POP serverom pomocou hesla prenesen�ho ako �ist� "
 "text. To je �asto jedin� mo�nos�, ktor� POP servery podporuj�."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -3841,26 +3973,27 @@ msgstr ""
 "APOP. Nemus� to fungova� pre v�etk�ch pou��vate�ov aj ke� server tvrd�, �e "
 "tento protokol podporuje."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#: camel/providers/pop3/camel-pop3-store.c:169
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "T�to vo�ba v�s spoj� s POP serverom pomocou overenia Kerberos 4."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nepodarilo sa overi� na KPOP serveri: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie je mo�n� sa spoji� s POP serverom na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPros�m, zadajte POP3 heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3869,12 +4002,12 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� pou��vate�sk�ho mena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Nezn�my)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3882,7 +4015,7 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Po�adovan� sp�sob overenia nie je podporovan�."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3891,13 +4024,13 @@ msgstr ""
 "Nepodarilo sa pripoji� k POP serveru.\n"
 "Chyba pri posielan� hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Prie�inok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3941,15 +4074,15 @@ msgstr "sendmail skon�il so stavom %d: po�ta neodoslan�."
 msgid "Could not find 'From' address in message"
 msgstr "Nie je mo�n� n�js� v spr�ve adresu 'Od'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos po�ty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3957,96 +4090,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr "Pre doru�enie po�ty spojen�m sa so vzdialen�m serverom pomocou SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktick� chyba, pr�kaz nezn�my"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktick� chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Pr�kaz neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Parameter pr�kazu neimplementovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Stav syst�mu alebo odpove� na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Spr�va pomocn�ka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Slu�ba pripraven�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Slu�ba zatv�ra prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Slu�ba nie je k dispoz�cii, zatv�ram prenosov� kan�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Po�adovan� po�tov� akcia v poriadku, dokon�en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, bude predan� pod�a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
+msgstr ""
+"Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Po�adovan� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Po�adovan� akcia zru�en�: chyba pri spracovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Pou��vate� nie je lok�lny, sk�ste <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Po�adovan� akcia nevykonan�: nedostatok miesta v syst�me"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Po�adovan� po�tov� akcia preru�en�: presiahnut� alok�cia miesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Po�adovan� akcia nevykonan�: meno po�tovej schr�nky nepovolen�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spusti� vstup po�ty, kon�� <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Nezadan� heslo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+#, fuzzy
+msgid "Authentication mechanism is too weak"
+msgstr "Overenie zlyhalo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Nepodarilo sa pripoji� k POP serveru.\n"
+"Po�adovan� sp�sob overenia nie je podporovan�."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Overenie zlyhalo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Overenie nie je vy�adovan�"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Chyba priv�tanie od serveru: %s : mo�no nie kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sPros�m, zadajte IMAP heslo pre %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Overenie nie je vy�adovan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4054,99 +4231,106 @@ msgstr ""
 "T�to vo�ba v�s pripoj� k SMTP serveru bez overenia. To je asi v poriadku pre "
 "v��inu SMTP serverov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid "This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "T�to vo�ba v�s pripoj� k SMTP serveru pomocou overenia CRAM-MD5."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doru�enie po�ty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je mo�n� posla� spr�vu: adresa odosielate�a nie je platn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je mo�n� posla� spr�vu: adres�ti nie s� definovan�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Vypr�al �as odpovede RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Neplatn� odpove� na overenie od serveru."
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Chyba odpovede MAIL FROM: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypr�al �as odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Chyba odpovede RCPT TO: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Chyba odpovede DATA: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypr�al �as posielania DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Chyba odpovede DATA: koniec spr�vy: %s: po�ta neodoslan�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypr�al �as odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Chyba odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Vypr�al �as odpovede QUIT: %s: nie je kritick�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Chyba odpovede QUIT: %s: nie je kritick�"
@@ -4185,11 +4369,6 @@ msgstr "pr�loha"
 msgid "Attach a file"
 msgstr "Prilo�i� s�bor"
 
-#: 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
-msgid "Remove"
-msgstr "Odstr�ni�"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Odstr�ni vybran� polo�ky zo zoznamu pr�loh"
@@ -4203,6 +4382,7 @@ msgid "Attach a file to the message"
 msgstr "Prilo�� s�bor k spr�ve"
 
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Pr�loha"
 
@@ -4226,40 +4406,52 @@ msgstr "Typ MIME:"
 msgid "Send as:"
 msgstr "Posla� ako:"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Kliknut�m zobraz�te adres�r"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Kliknut�m zobraz�te adres�r"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Odpoveda� komu:"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "Zadajte identitu, pod ktorou chcete t�to spr�vu posla�"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adres�tov spr�vy"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktor� dostan� k�piu spr�vy"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4267,15 +4459,7 @@ msgstr ""
 "Zadajte adresy, ktor� dostan� k�piu spr�vy bez toho, aby boli v zozname "
 "adres�tov spr�vy."
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Predmet:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Zadajte predmet spr�vy"
-
-#: composer/e-msg-composer.c:512
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4284,25 +4468,26 @@ msgstr ""
 "Nie je mo�n� otvori� s�bor s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Ulo�i� ako..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladan� s�boru: %s"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri na��tavan� s�boru: %s"
 
-#: composer/e-msg-composer.c:791 shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:797
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4312,27 +4497,27 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:822
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Otvori� s�bor"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "S�bor neexistuje."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Toto nie je norm�lny s�bor."
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "S�bor existuje, ale ned� sa pre��ta�."
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "S�bor vyzer� ako dostupn�, ale open(2) zlyhala."
 
-#: composer/e-msg-composer.c:1000
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4340,15 +4525,15 @@ msgstr ""
 "S�bor je ve�mi ve�k� (viac ako 100K)\n"
 "Naozaj ho chcete vlo�i�?"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Nastala chyba po�as ��tania s�boru."
 
-#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Nap�sa� spr�vu"
 
-#: composer/e-msg-composer.c:1580
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Nie je mo�n� vytvori� okno editora spr�v."
 
@@ -4364,6 +4549,71 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nie je mo�n� inicializova� editor spr�v Evolution."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Shell Evolution."
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Adresa _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Inform�cie o pou��vate�ovi"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: 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"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: 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"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Komponent Evolution pre S�hrn."
@@ -4642,38 +4892,20 @@ msgstr "teraz"
 msgid "<click here to select a date>"
 msgstr "<kliknut�m vyberiete d�tum>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:332
-#: mail/mail-autofilter.c:354
-msgid "Add Filter Rule"
-msgstr "Prida� pravidlo filtra"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Upravi� pravidlo filtra"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "prijat�"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "odoslan�"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Upravi� filtre"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Pravidl� filtra"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Potom"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Prida� akciu"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Odstr�ni� akciu"
 
@@ -4685,7 +4917,7 @@ msgstr ""
 "Aj, zabudli ste vybra� prie�inok.\n"
 "Pros�m, vr�te sa a zadajte platn� prie�inok, kam doru�i� po�tu."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Vybra� prie�inok"
 
@@ -4710,35 +4942,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:545
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Meno pravidla: "
 
-#: filter/filter-rule.c:549
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:565
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:582
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Spusti� akcie"
 
-#: filter/filter-rule.c:586
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "ak odpovedaj� v�etky krit�ri�"
 
-#: filter/filter-rule.c:591
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "ak odpoved� niektor� krit�rium"
 
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Prida� krit�rium"
 
-#: filter/filter-rule.c:608
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Odstr�ni� krit�rium"
 
@@ -4746,8 +4978,8 @@ msgstr "Odstr�ni� krit�rium"
 msgid "Replied to"
 msgstr "Odpovedan�"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "D�le�it�"
@@ -4756,14 +4988,14 @@ msgstr "D�le�it�"
 msgid "Read"
 msgstr "Pre��tan�"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Upravi� filtre"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Upravi� vprie�inky"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Pravidl� filtra"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Prijat�"
@@ -4772,343 +5004,326 @@ msgstr "Prijat�"
 msgid "Outgoing"
 msgstr "Odoslan�"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtu�lne prie�inky"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Uveden� prie�inok nebol n�jden�"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "Zdroje vprie�inkov"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Odpovedan�"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Priradi� farbu"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Priradi� sk�re"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Pr�loha"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kop�rova� do prie�inku"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "D�tum prijatia"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "D�tum odoslania"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Odstr�nen�"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "N�vrh"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "nekon�� na"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "nevyzer� ako"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "neza��na na"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "kon�� na"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Koniec"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "V�raz"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Vyzna�en�"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Preda� �alej na adresu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "je viac ne�"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "je menej ne�"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "nie je"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Telo spr�vy"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Hlavi�ka spr�vy"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Spr�va bola prijat�"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Spr�va bola odoslan�"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Presun�� do prie�inku"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "d�a a po"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "d�a a pred"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Adres�ti"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Regul. v�raz"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Viden�"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Nastavi� vyzna�enie"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Nastavi� stav"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:71
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "vyzer� ako"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Zdroj"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "�peci�lna hlavi�ka"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "za��na na"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Zastavi� spracovanie"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "nekon�� na"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "nevyzer� ako"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "neza��na na"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "kon�� na"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "je viac ne�"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "je menej ne�"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "odpoved� reg. v�razu"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "d�a a po"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "d�a a pred"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "vyzer� ako"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "za��na na"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "bolo pred"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Prida� pravidlo"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Upravi� pravidlo sk�re"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Prida� pravidlo vprie�inku"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Upravi� pravidlo vprie�inku"
-
-#: mail/component-factory.c:302
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je mo�n� inicializova� po�tov� komponent Evolution."
 
-#: mail/component-factory.c:375
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Nie je mo�n� zaregistrova� sklad u shellu"
 
-#: mail/folder-browser.c:218
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Vlastnosti"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: mail/folder-browser.c:219
 msgid "Store search as vFolder"
 msgstr "Ulo�i� h�adanie ako vPrie�inok"
 
-#: mail/folder-browser.c:506
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "Vprie�inok na predmet"
 
-#: mail/folder-browser.c:507
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "Vprie�inok na odosielate�ovi"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "Vprie�inok na adres�toch"
 
-#: mail/folder-browser.c:509 mail/folder-browser.c:627
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "VPrie�inok na konferenciu"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filter na predmet"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filter na odosielate�ovi"
 
-#: mail/folder-browser.c:513
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filter na adres�toch"
 
-#: mail/folder-browser.c:514 mail/folder-browser.c:626
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:520 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otvori�"
-
-#: mail/folder-browser.c:522
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Ulo�i� ako..."
 
-#: mail/folder-browser.c:523 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tla�i�"
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Odpoveda� odosielate�ovi"
 
-#: mail/folder-browser.c:526 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Odpoveda� v�etk�m"
 
-#: mail/folder-browser.c:527 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Posla� �alej"
 
-#: mail/folder-browser.c:528 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Preda� �alej v tele"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Ozna�i� ako pre��tan�"
 
-#: mail/folder-browser.c:531
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Ozna�i� ako nepre��tan�"
 
-#: mail/folder-browser.c:533
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Presun�� do prie�inku..."
 
-#: mail/folder-browser.c:534
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kop�rova� do prie�inku..."
 
-#: mail/folder-browser.c:536
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Obnovi� zmazan� z�znam"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:540
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Pou�i� filtre"
 
-#: mail/folder-browser.c:542
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Vytvori� pravidlo zo spr�vy"
 
-#: mail/folder-browser.c:629
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:630
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrie�inok na konferenciu (%s)"
@@ -5145,22 +5360,6 @@ msgstr "Vytv�racie rozhranie pre po�tov� komponent Evolution."
 msgid "Factory for the Mail Summary component."
 msgstr "Vytv�racie rozhranie pre komponent S�hrnu po�ty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Vytv�racie rozhranie pre import s�borov Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Vytv�racie rozhranie pre import s�borov mbox do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importuje s�bory Outlook Express 4 do Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importuje s�bory mbox do Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "S��asn� form�t ukladania:"
@@ -5195,15 +5394,6 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:707 mail/mail-account-editor.c:709
-#: mail/mail-account-editor.c:798 mail/mail-accounts.c:115
-#: mail/mail-config-druid.c:922 mail/mail-config.glade.h:45
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "�iadna"
-
 #: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (�tandard)"
@@ -5221,7 +5411,7 @@ msgstr "Naozaj chcete odstr�ni� tento ��et diskusn�ch skup�n?"
 msgid "Evolution Account Manager"
 msgstr "Spr�vca ��tov Evolution"
 
-#: mail/mail-account-editor.c:290
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5230,10 +5420,15 @@ msgstr ""
 "Chcete ich aj tak ulo�i�?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:658
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Editor ��tov Evolution"
 
+#: mail/mail-account-editor.c:727
+#, fuzzy
+msgid "Unspecified"
+msgstr "Nedefinovan�"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5249,12 +5444,16 @@ msgstr "Predmet je %s"
 msgid "Mail from %s"
 msgstr "Po�ta od %s"
 
-#: mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Prida� pravidlo filtra"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5266,7 +5465,7 @@ msgstr ""
 "posiela�, prij�ma� alebo p�sa� po�tu.\n"
 "Chcete ho nastavi� teraz?"
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5274,7 +5473,7 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� identitu."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5282,11 +5481,11 @@ msgstr ""
 "Predt�m, ako za�nete p�sa� spr�vu,\n"
 "mus�te nastavi� sp�sob prenosu.."
 
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Nem�te nastaven� sp�sob prenosu po�ty"
 
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5294,32 +5493,32 @@ msgstr ""
 "T�to spr�va nem� predmet.\n"
 "Naozaj ju chcete posla�?"
 
-#: mail/mail-callbacks.c:292
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr "Mus�te nastavi� ��et pred poslan�m tejto spr�vy."
 
-#: mail/mail-callbacks.c:314
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr "Mus�te zada� adres�tov pre poslanie tejto spr�vy."
 
-#: mail/mail-callbacks.c:577
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "V %s, %s zap�san�:\n"
 
-#: mail/mail-callbacks.c:735
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Predan� spr�va:\n"
 
-#: mail/mail-callbacks.c:820
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Presun�� spr�vu do"
 
-#: mail/mail-callbacks.c:822
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kop�rova� spr�vu do"
 
-#: mail/mail-callbacks.c:957
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5327,11 +5526,11 @@ msgstr ""
 "Upravova� m��ete iba spr�vy ulo�en�\n"
 "v prie�inku Koncepty."
 
-#: mail/mail-callbacks.c:990 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Prep�sa� s�bor?"
 
-#: mail/mail-callbacks.c:994 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5339,15 +5538,15 @@ msgstr ""
 "S�bor s t�mto menom u� existuje\n"
 "Prep�sa� ho?"
 
-#: mail/mail-callbacks.c:1038
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Ulo�i� spr�vu ako..."
 
-#: mail/mail-callbacks.c:1040
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Ulo�i� spr�vy ako..."
 
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5356,11 +5555,11 @@ msgstr ""
 "Chyba pri na��tavan� inform�cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1197
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Tla�i� spr�vu"
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Tla� spr�vy zlyhala"
 
@@ -5376,31 +5575,27 @@ msgstr "Inform�cia o ��te"
 msgid "Account Management"
 msgstr "Spr�va ��tu"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Vlastnosti ��tu"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Pokro�il�"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automaticky kontrolova� po�tu ka�d�ch"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Overi� nastavenie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5417,190 +5612,188 @@ msgstr ""
 "Kliknut�m na \"Dokon�i�\" ulo��te va�e nastavenie."
 
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
+#, fuzzy
+msgid "De_fault"
 msgstr "�tandardn�"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Hotovo"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+msgid "Email Address:"
 msgstr "E-mailov� adresa:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email Address:"
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Email address:"
 msgstr "E-mailov� adresa:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Nastavenie po�ty Evolution"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Cel� meno:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Hostite�:"
 
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identita"
 
 #: mail/mail-config.glade.h:32
-msgid "Include in \"Get Mail\" operations."
-msgstr "Zahrn�� do oper�ci� \"Stiahnu� po�tu\"."
+msgid "Include this account when receiving mail"
+msgstr ""
 
 #: mail/mail-config.glade.h:33
-msgid "Incoming Mail Server"
-msgstr "Server pre pr�jem po�ty"
-
-#: mail/mail-config.glade.h:34
 msgid "Keep mail on server"
 msgstr "Nech�va� po�tu na serveri"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "Po�ta"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Po�tov� ��et"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Nastavenie po�ty"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Sprievodca pre nastavenie po�ty"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Pou�i� ho ako �tandardn� ��et"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Ozna�i� spr�vy ako \"Pre��tan�\" po:"
 
 #: mail/mail-config.glade.h:42
-msgid "Miscellaneous"
-msgstr "R�zne"
-
-#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "Diskusn� skupiny"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Volite�n�"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organiz�cia:"
 
-#: mail/mail-config.glade.h:49
-msgid "Outgoing Mail Server"
-msgstr "Server odosielanej po�ty"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "PGP binary path:"
 msgstr "Cesta k spustite�n�mu s�boru PGP:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Heslo:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "�ist� text"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Pr�jem po�ty"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Ulo�i� heslo"
 
-#: mail/mail-config.glade.h:56 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Odpoveda� komu:"
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Adresa WWW str�nky:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Po�adovan�"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Ulo�i� heslo"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Vybra� s�bor s podpisom"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "Posiela� �tandardne ako HTML."
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Server vy�aduje overenie"
 
-#: mail/mail-config.glade.h:68
-msgid "Servers"
-msgstr "Servery"
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "S�bor s podpisom:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Tento server vy�aduje bezpe�n� pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid "Transport"
 msgstr "Prenos"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Overenie"
+
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5608,15 +5801,15 @@ msgstr ""
 "Zadajte meno, ktor�m chcete tieto servery ozna�ova�. Napr�klad:\"Doma\" "
 "alebo \"Pr�ca\"."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Inform�cie o pou��vate�ovi"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Meno pou��vate�a:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5626,11 +5819,17 @@ msgstr ""
 "\n"
 "Kliknut�m \"�al��\" za�neme."
 
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Upravi�"
+
 #: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "min�t."
 
-#: mail/mail-config-druid.c:401
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5639,11 +5838,11 @@ msgstr ""
 "Nepodarilo sa overi� nastavenie prij�mania po�ty.\n"
 "Mo�no sa stretnete s probl�mami pri pr�jme va�ej po�ty z %s"
 
-#: mail/mail-config-druid.c:495
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Priestor mien:"
 
-#: mail/mail-config-druid.c:683
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5653,7 +5852,7 @@ msgstr ""
 "Mo�no sa stretnete s probl�mami pri odosielan� va�ej po�ty z %s"
 
 #. set window title
-#: mail/mail-config-druid.c:1042
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca ��tom Evolution"
 
@@ -5697,91 +5896,96 @@ msgstr "Skry�"
 msgid "%s attachment"
 msgstr "%s pr�loha"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Na��tavam obsah spr�vy"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Za�ifrovan� spr�va nie je zobrazen�"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Za�ifrovan� spr�va"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre de�ifrovanie."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� a podpis je platn�."
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� ale podpis nie je platn�."
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lok�lny s�bor (%s) platn� na serveri \"%s\""
 
-#: mail/mail-format.c:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lok�lny s�bor (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Nespr�vna �as� extern�ho tela."
 
-#: mail/mail-local.c:456
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Prie�inok `%s' neexistuje."
+
+#: mail/mail-local.c:508
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otv�ram '%s'"
 
-#: mail/mail-local.c:738
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Men� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:742
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Zmeni� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:766
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Prenastavujem prie�inok"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:795
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Zatv�ram aktu�lny prie�inok"
 
-#: mail/mail-local.c:827
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Premenov�vam star� prie�inok a otv�ram"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Vytv�ram nov� prie�inok"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kop�rujem spr�vy"
 
-#: mail/mail-local.c:880
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5790,7 +5994,7 @@ msgstr ""
 "Nie je mo�n� ulo�i� metainform�cie do prie�inku, asi zist�te,\n"
 "�e ho nie je mo�n� ani otvori�: %s"
 
-#: mail/mail-local.c:919
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5816,11 +6020,15 @@ msgstr ""
 "Chyba pri vykon�van� oper�cie:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:789
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-mt.c:771
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Priebeh Evolution"
 
@@ -5833,75 +6041,75 @@ msgstr "Posielam \"%s\""
 msgid "Sending message"
 msgstr "Posielam spr�vu"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Uklad�m spr�vu do prie�inku"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pres�vam spr�vy do %s"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kop�rujem spr�vy do %s"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Premiest�ujem"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kop�rujem"
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s spr�va %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prech�dzam prie�inky v \"%s\""
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Spr�vy predan� �alej"
 
-#: mail/mail-ops.c:1109 mail/mail-ops.c:1247
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otv�ram prie�inok %s"
 
-#: mail/mail-ops.c:1176
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Otv�ram sklad %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "�ist�m prie�inok"
 
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Z�skavam spr�vu %s"
 
-#: mail/mail-ops.c:1479
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Z�skavam spr�vy"
 
-#: mail/mail-ops.c:1489
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Z�skavam spr�vu ��slo %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Uklad�m spr�vy"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5910,12 +6118,12 @@ msgstr ""
 "Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Uklad�m spr�vu %d z %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5924,11 +6132,11 @@ msgstr ""
 "Chyba pri ukladan� spr�v do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Uklad�m pr�lohu"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5937,7 +6145,7 @@ msgstr ""
 "Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1786
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je mo�n� zap�sa� d�ta: %s"
@@ -5982,60 +6190,67 @@ msgstr "Dokon�en�."
 msgid "Incomplete message written on pipe!"
 msgstr "Do r�ry zap�san� ne�pln� spr�va!"
 
-#: mail/mail-tools.c:146
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nie je mo�n� vytvori� do�asn� po�tov� schr�nku `%s': %s"
 
-#: mail/mail-tools.c:199
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (predan� spr�va)"
 
-#: mail/mail-tools.c:209
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (�iadny predmet)"
 
-#: mail/mail-tools.c:226
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predan� spr�va - %s"
 
-#: mail/mail-tools.c:228
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Predan� spr�va (bez predmetu)"
 
-#: mail/mail-vfolder.c:170
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr ""
+
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VPrie�inky"
 
-#: mail/mail-vfolder.c:335
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nov� vPrie�inok"
 
 #. 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 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Odpoveda�"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Odpoveda� odosielate�ovi tejto spr�vy"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Odpoveda� v�etk�m adres�tom tento spr�vy"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Preda� t�to spr�vu �alej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Tla�i� vybran� spr�vu"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Odstr�ni� t�to spr�vu"
 
@@ -6043,6 +6258,14 @@ msgstr "Odstr�ni� t�to spr�vu"
 msgid "Unseen"
 msgstr "Neviden�"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Viden�"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Odpovedan�"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Viacero nepre��tan�ch spr�v"
@@ -6090,6 +6313,10 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Vyzna�en�"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Od"
@@ -6313,7 +6540,8 @@ msgstr ""
 
 #: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
+msgstr ""
+"Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
 
 #: shell/e-setup.c:157
 msgid "Could not update files correctly"
@@ -6455,7 +6683,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvori� lok�lny sklad -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6541,13 +6769,13 @@ msgstr "Odstr�ni� t�to skratku z panelu skratiek"
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladan� skratiek."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Poh�ad"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Zobrazi� vybran� prie�inok"
 
@@ -6603,8 +6831,8 @@ msgstr "Uveden� typ nie je podporovan� t�mto skladom"
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6642,7 +6870,7 @@ msgstr ""
 "D�fame, �e v�s pote�ia v�sledky na�ej �a�kej pr�ce a netrpezlivo\n"
 "�ak�me na v� pr�spevok!\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6650,15 +6878,15 @@ msgstr ""
 "V�aka\n"
 "T�m Evolution\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nie je mo�n� inicializova� shell Evolution."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Zak�za�."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je mo�n� inicializova� komponentov� syst�m Bonobo."
 
@@ -6682,40 +6910,53 @@ msgstr "N�js� kontakt"
 msgid "New contact"
 msgstr "Nov� kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Uk�ka spr�vy pred tla�ou"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Tla�i� kontakty"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Zastavi�"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Zastavi� na��tavanie"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Zobrazi� v�etko"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Zobrazi� v�etky kontakty"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Nastavenie _adres�ra..."
+#: ui/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Zdroje adres�ra"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Tla�i� kontakty..."
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "_Contact"
+msgstr "_Kontakty..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Tla�i�..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "_H�ada� kontakty"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_N�stroje"
 
@@ -6727,117 +6968,119 @@ msgstr "5 dn�"
 msgid "Alter preferences"
 msgstr "Zmeni� nastavenie"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lend�r"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Nastavenie kalend�ra..."
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Vytvori� nov� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Vytvori� nov� kalend�r"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "De�"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Go To"
+msgstr "Prejs� na"
+
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "Prejs� dozadu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "Prejs� dopredu"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Prejs� na"
-
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Prejs� na zadan� d�tum"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Prejs� na aktu�lny �as"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "New Appointment"
 msgstr "Nov� sch�dzka"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Nasl"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Otvori� kalend�r"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Pred"
 
 #: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print calendar"
+msgstr "Tla�i� kalend�r"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Tla�i� tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Ulo�i� ako"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Ulo�i� kalend�r ako nie�o in�"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Zobrazi� jeden de�"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Zobrazi� jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Zobrazi� jeden t��de�"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Zobrazi� pracovn� t��de�"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Dnes"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "T��de�"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Appointment"
+msgstr "Sch�dzka"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Nov�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "_Otvori� kalend�r"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "_Tla�i� tento kalend�r"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Ulo�i� _ako..."
 
@@ -6863,7 +7106,7 @@ msgid "Print this item"
 msgstr "Tla�i� t�to polo�ku"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tla�i�..."
 
@@ -6895,17 +7138,13 @@ msgid "Send _message to contact..."
 msgstr "Posla� _spr�vu kontaktu..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_S�bor"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Tla�i�..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Ulo�i�"
@@ -6954,7 +7193,7 @@ msgstr "Zavrie� t�to sch�dzku"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "_Kop�rova� do prie�inku..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kop�rova�"
@@ -6971,6 +7210,10 @@ msgstr "Vystrihn��"
 msgid "Cut the selection"
 msgstr "Vystrihne v�ber"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Odstr�ni� t�to sch�dzku"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "Vyp�sa� XML"
@@ -7039,12 +7282,8 @@ msgstr "Nastavenie _tla�iarne..."
 msgid "Print Setup"
 msgstr "Nastavenie tla�iarne"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Vlastnosti"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Ulo�i�"
 
@@ -7057,10 +7296,6 @@ msgstr "Ulo�i� sch�dzku a zavrie� tento dial�g"
 msgid "Save the current file"
 msgstr "Ulo�i� aktu�lny s�bor"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Napl�nova� stretnutie"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "Napl�nova� _stretnutie"
@@ -7085,18 +7320,18 @@ msgstr "Nastav� str�nku pre aktu�lnu tla�iare�"
 msgid "Task _Request (FIXME)"
 msgstr "_Po�iadavka na �lohu"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_O programe..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Zavrie�"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
@@ -7104,19 +7339,13 @@ msgstr "_Kontakt"
 msgid "_Copy"
 msgstr "_Kop�rova�"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Ladi�"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Upravi�"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Pomocn�k"
 
@@ -7153,7 +7382,8 @@ msgstr "_Vlo�i�"
 msgid "_Print"
 msgstr "_Tla�i�"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
@@ -7190,206 +7420,262 @@ msgstr "Nastavenie S�hrnu..."
 msgid "New Mail"
 msgstr "Nov� spr�va"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Nap�sa�"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Nap�sa� nov� spr�vu"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Kop�rova� spr�vu do nov�ho prie�inka"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Vytvori� pravidlo"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "P_rie�inok"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Vytvori� pravidlo zo spr�vy"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filter na _odosielate�a"
+msgid "Display all of the message headers"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filter na _adres�tov"
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Upravi� �lohu"
 
 #: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Filter na odosielate�ovi"
+
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Filter na adres�toch"
+
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Filter na predmet"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Zabudn�� _hesl�"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Stiahnu� po�tu"
-
 #: ui/evolution-mail.xml.h:16
-msgid "Hide S_elected Messages"
-msgstr "Skry� _vybran� spr�vy"
-
-#: ui/evolution-mail.xml.h:17
-msgid "Hide _Deleted Messages"
-msgstr "Skry� _odstr�nen� spr�vy"
+#, fuzzy
+msgid "Forward As"
+msgstr "Posla� �alej"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
-msgstr "Skry� _pre��tan� spr�vy"
+#, fuzzy
+msgid "Full Headers"
+msgstr "Hlavi�ka"
 
 #: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtre po�ty..."
+msgid "Hide S_elected Messages"
+msgstr "Skry� _vybran� spr�vy"
 
 #: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Spr�va prihl�sen�..."
+msgid "Hide _Deleted Messages"
+msgstr "Skry� _odstr�nen� spr�vy"
 
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Ozna�i� ako _pre��tan�"
+msgid "Hide _Read messages"
+msgstr "Skry� _pre��tan� spr�vy"
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Ozna�i� ako _nepre��tan�"
+#, fuzzy
+msgid "Inline"
+msgstr "Zobrazi� v texte"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "Presun��"
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Spr�va prihl�sen�..."
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "Presun�� spr�vu do nov�ho prie�inka"
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Ozna�i� ako pre��tan�"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Uk�ka spr�vy pred tla�ou"
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Ozna�i� ako pre��tan�"
+
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Ozna�i� ako nepre��tan�"
 
 #: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Uk�ka spr�vy pred tla�ou..."
+#, fuzzy
+msgid "Message _Display"
+msgstr "Telo spr�vy"
 
 #: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Tla�i� spr�vu na tla�iarni"
+msgid "Move"
+msgstr "Presun��"
 
 #: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Tla�i� spr�vu..."
+msgid "Move message to a new folder"
+msgstr "Presun�� spr�vu do nov�ho prie�inka"
 
 #: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Odpoveda� _v�etk�m"
+msgid "Print message to the printer"
+msgstr "Tla�i� spr�vu na tla�iarni"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Odpoveda� _odosielate�ovi"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Pozn�mka"
 
 #: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Odpoveda� _v�etk�m"
+
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "_Zdroj"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Vybra� _v�etko"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Vybra� _v�etko"
+
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Send and Receive"
+msgstr "Pr�jem a odoslanie po�ty"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Posla� neodoslan� po�tu a prija� nov� po�tu"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "Uk�za� _v�etky spr�vy"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Zobrazi� v�etko"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Zoznam vl�kien"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "Vprie�inok na _odosielate�a"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "Vprie�inok na _adres�tov"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Vprie�inok na predmet"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Zobrazi� �ist� k�d spr�vy"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Editor _virtu�lneho prie�inku..."
+
+#: ui/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Actions"
+msgstr "A_kcie"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Pou�i� filtre"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Nastavenie prie�inku..."
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Nap�sa�"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kop�rova� do prie�inku..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Upravi� spr�vu"
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Vytvori� pravidlo zo spr�vy"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Vy�isti�"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filter na predmet"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtre po�ty..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Prie�inok"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "Posla� �_alej"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obr�ti� v�ber"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Nastavenie po�ty..."
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Posla� spr�vu"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "Nastavenie..."
+
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Message Hiding"
 msgstr "_Spr�va"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "Pre_sun�� do prie�inka..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "Otvori� v novom o_kne"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Tla�i� spr�vu"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Skry� _vybran� spr�vy"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Ulo�i� spr�vu _ako..."
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid "_Send and Receive"
+msgstr "Pr�jem a odoslanie po�ty"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Vl�kna"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "Obnovi� _zmazan�"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_vPrie�inok na predmete"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor _virtu�lneho prie�inku..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prilo�i�"
@@ -7495,15 +7781,56 @@ msgstr "Zobrazi� pr�lohy"
 msgid "Sign this message with your PGP key"
 msgstr "Podp�sa� t�to spr�vu k���om PGP"
 
+#: ui/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+
+#: ui/evolution-message-composer.xml.h:36
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Insert"
+msgstr "_Index"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Vlo�i� _textov� s�bor..."
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Otvori�..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Odpoveda� komu:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "Za_bezpe�enie"
 
@@ -7511,6 +7838,10 @@ msgstr "Za_bezpe�enie"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Prida� prie�inok do zoznamu prihl�sen�ch prie�inkov"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "P_rie�inok"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Obnovi� zoznam"
@@ -7591,7 +7922,7 @@ msgstr "Vr�ti�"
 msgid "Undo the last action"
 msgstr "Vr�ti sp� posledn� akciu"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "S_ch�dzka"
 
@@ -7608,8 +7939,9 @@ msgid "Create a new task"
 msgstr "Vytvori� nov� �lohu"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Nov�"
+#, fuzzy
+msgid "New Task"
+msgstr "�loha"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7619,6 +7951,11 @@ msgstr "Ulo�i� �lohu ako nie�o in�"
 msgid "Tasks Preferences..."
 msgstr "Nastavenie �loh..."
 
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "�loha"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "O Evolution..."
@@ -7628,8 +7965,9 @@ msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Pri_sp�sobi�..."
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Prisp�sobi� panely n�strojov"
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7652,96 +7990,96 @@ msgid "Evolution bar _shortcut"
 msgstr "_Skratka pre panel Evolution"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Koniec"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Ukon�� program"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "_Za��name"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Importuje extern� s�bor"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hlavn� panel n�strojov"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Zobraz� inform�ciu o Evolution"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Uk�za� panel _prie�inkov"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Uk�za� panel _skratiek"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Po�le spr�vu o chybe"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "_Posla� spr�vu o chybe"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Po�le spr�vu o chybe pomocou n�stroja pre oznamovanie ch�b."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, �i sa m� zobrazova� panel prie�inkov"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, �i sa m� zobrazova� panel skratiek"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Pomocou Spr�vcu  ko_ntaktov"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Pomocou _Kalend�ra"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Pomocou _Po�ty "
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Work Offline"
+msgstr "Pracujem"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Prie�inok"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Prejs� do prie�inku..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "_Importova� s�bor..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Posla� spr�vu"
 
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nov� vPrie�inok"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Nas_tavenie"
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "_Skry� panel skratiek"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -7822,6 +8160,11 @@ msgstr "_Koniec stretnutia:"
 msgid "All Attendees"
 msgstr "V�etci ��astn�ci"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "aktu�lny tento"
+
 #. 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
@@ -7833,26 +8176,68 @@ msgstr "PUS�PSN"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Teraz"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: 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.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: 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"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "H�ada�"
+
+#: widgets/misc/e-filter-bar.c:231
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Pokro�il�"
+
+#: widgets/misc/e-filter-bar.c:311
+#, fuzzy
+msgid "Advanced ..."
+msgstr "Pokro�il�..."
+
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Inform�cia"
@@ -7898,3 +8283,252 @@ msgstr "init_corba(): Nie je mo�n� inicializova� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je mo�n� inicializova� Bonobo"
 
+#~ msgid "Disabled"
+#~ msgstr "Zak�zan�"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synchronizova�"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kop�rova� z Pilota"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kop�rova� do Pilota"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Spoji� z Pilota"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Spoji� do Pilota"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "P�vodn� autor:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Spojka pre adres�r Evolution"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation a Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Konfigura�n� n�stroj pre spojku adres�ra Evolution.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Akcia Synchronizova�"
+
+#~ msgid "Conduit state"
+#~ msgstr "Stav spojky"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nie je nastaven� �iadny pilot, pros�m,\n"
+#~ "najprv pou�ite 'Vlastnosti spojenia Pilota'."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Nespojen� s d�monom gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Nastala chyba pri pokuse o z�skanie\n"
+#~ "zoznamu pilotov od d�mona gnome-pilot"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Spojka kalend�ra Evolution"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "N�stroj pre nastavenie spojky pre kalend�r Evolution.\n"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Spojka ToDo pre Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "N�stroj pre nastavenie spojky pre todo Evolution.\n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "Priorita mus� by� medzi 1 a� 9"
+
+#~ msgid "Schedule meeting"
+#~ msgstr "Napl�nova� stretnutie"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Upravi� t�to sch�dzku..."
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid ""
+#~ "This option will connect to the SMTP server using CRAM-MD5 authentication."
+#~ msgstr "T�to vo�ba v�s pripoj� k SMTP serveru pomocou overenia CRAM-MD5."
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Zadajte identitu, pod ktorou chcete t�to spr�vu posla�"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Zadajte predmet spr�vy"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Upravi� pravidlo filtra"
+
+#~ msgid "incoming"
+#~ msgstr "prijat�"
+
+#~ msgid "outgoing"
+#~ msgstr "odoslan�"
+
+#~ msgid "Deleted"
+#~ msgstr "Odstr�nen�"
+
+#~ msgid "Draft"
+#~ msgstr "N�vrh"
+
+#~ msgid "Set Flag"
+#~ msgstr "Nastavi� vyzna�enie"
+
+#~ msgid "matches regex"
+#~ msgstr "odpoved� reg. v�razu"
+
+#~ msgid "Add Rule"
+#~ msgstr "Prida� pravidlo"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Prida� pravidlo vprie�inku"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Upravi� pravidlo vprie�inku"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Vytv�racie rozhranie pre import s�borov Outlook Express 4 do Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Vytv�racie rozhranie pre import s�borov mbox do Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importuje s�bory Outlook Express 4 do Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importuje s�bory mbox do Evolution"
+
+#~ msgid "Account Properties"
+#~ msgstr "Vlastnosti ��tu"
+
+#~ msgid "E-Mail Address:"
+#~ msgstr "E-mailov� adresa:"
+
+#~ msgid "Include in \"Get Mail\" operations."
+#~ msgstr "Zahrn�� do oper�ci� \"Stiahnu� po�tu\"."
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Server pre pr�jem po�ty"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "R�zne"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Server odosielanej po�ty"
+
+#~ msgid "Servers"
+#~ msgstr "Servery"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Nastavenie _adres�ra..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Tla�i� kontakty..."
+
+#~ msgid "Ca_lendar"
+#~ msgstr "Ka_lend�r"
+
+#~ msgid "Calendar Preferences..."
+#~ msgstr "Nastavenie kalend�ra..."
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Tla�i� tento kalend�r"
+
+#~ msgid "Create Rule"
+#~ msgstr "Vytvori� pravidlo"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filter na _odosielate�a"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filter na _adres�tov"
+
+#~ msgid "Get Mail"
+#~ msgstr "Stiahnu� po�tu"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Ozna�i� ako _pre��tan�"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Ozna�i� ako _nepre��tan�"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Uk�ka spr�vy pred tla�ou..."
+
+#~ msgid "Print message..."
+#~ msgstr "Tla�i� spr�vu..."
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Odpoveda� _odosielate�ovi"
+
+#~ msgid "Show _All Messages"
+#~ msgstr "Uk�za� _v�etky spr�vy"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Nastavenie prie�inku..."
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Upravi� spr�vu"
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filter na predmet"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Nastavenie po�ty..."
+
+#~ msgid "_Open in New Window"
+#~ msgstr "Otvori� v novom o_kne"
+
+#~ msgid "_Print Message"
+#~ msgstr "_Tla�i� spr�vu"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Ulo�i� spr�vu _ako..."
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_vPrie�inok na predmete"
+
+#~ msgid "New"
+#~ msgstr "Nov�"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "Pri_sp�sobi�..."
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Uk�za� panel _prie�inkov"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Uk�za� panel _skratiek"
+
+#~ msgid "_Settings"
+#~ msgstr "Nas_tavenie"
diff --git a/po/sl.po b/po/sl.po
index 27ec153e83..9fcb6e5893 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,12 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-03-11 21:53+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/e-card.c:3053
@@ -319,125 +319,6 @@ msgstr "Uvozi GnomeVizitka datoteke v Evolucijo. "
 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Izklju�eno"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Uskladi"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Kopiraj iz Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Kopiraj na Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Zlij iz Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Zlij na Pilota"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Prvotni avtor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 Fundacija za prosto programje in Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Uskladi dejanje"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Stanje veznika"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Noben Pilot ni nastavljen, prosim najprej izberite\n"
-"'Lastnosti povezave s Pilotom' nastavitveni vstavek."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nisem povezaqn z gnome-pilot daemonom"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ob prena�anju seznama pilotov z gnome-pilot\n"
-"daemona se je zgodila napaka"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel nalo�iti\n"
@@ -463,14 +344,6 @@ msgstr "Nisem mogel pognati programa wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Nastavi veznik adresarja"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolucijin veznik adresarja "
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -533,7 +406,7 @@ msgid "Phone Types"
 msgstr "Tipi telefonov"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
@@ -572,7 +445,7 @@ msgstr "_Podjetje:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
 #: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Zbri�i"
 
@@ -624,113 +497,132 @@ msgstr "_To je po�tni naslov"
 msgid "Delete Contact?"
 msgstr "Zbri�i stik?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada slede�im kategorijam:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Pomo�nik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Slu�ba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Slu�ba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Slu�beni faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Doma�i faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-naslov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-naslov 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Uredi filtre"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Polno ime:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-po�ta"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Naslov _2:"
@@ -925,7 +817,7 @@ msgid "None (anonymous mode)"
 msgstr "Brez (anonimni na�in)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -1055,7 +947,7 @@ msgstr "Viri adresarja"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1077,6 +969,12 @@ msgstr "Ime"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Drugo stiki"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for displaying an address."
 msgstr "Kontrola Bonobo za prikaz naslova."
@@ -1121,6 +1019,21 @@ msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Poi��i..."
@@ -1497,18 +1410,6 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "�irina:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "ozna�ba26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolucijin veznik koledarja"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1519,30 +1420,6 @@ msgstr "Napaka ob komuniciranju s stre�nikom koledarja"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Nastavi veznik GnomeCal"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Nastavi veznik za-opravit"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolucijin veznik za-opravit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolucijin veznik za-opravit"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-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
 msgid "Could not read pilot's ToDo application block"
@@ -1584,7 +1461,7 @@ msgstr "Zaupno"
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Neznano"
 
@@ -1681,8 +1558,7 @@ msgstr ""
 #: calendar/gui/calendar-model.c:885
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
+msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
@@ -1974,8 +1850,7 @@ msgid "Pick a color"
 msgstr "Izberi barvo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioriteta"
 
@@ -2377,7 +2252,7 @@ msgid "New Appointment..."
 msgstr "Nov zmenek..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Odpri"
@@ -2497,8 +2372,7 @@ msgstr "Nalagam koledar..."
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Po�iljatelj"
 
@@ -2590,8 +2464,8 @@ msgstr ""
 "Na�rtuj\n"
 "�as"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Stanje"
 
@@ -2713,14 +2587,12 @@ msgstr "_�as pri�etka:"
 msgid "_Starting date:"
 msgstr "Datum _pri�etka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "pred"
 
@@ -2745,34 +2617,26 @@ msgid "hour(s)"
 msgstr "ur"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "ozna�ba21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mesec"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "pri�etek zmenka"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "tednov"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "let"
 
@@ -3156,9 +3020,9 @@ msgstr "Trenutno leto (%Y)"
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -3171,8 +3035,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolucija je vzela posle, ki so bili v va�i mapi koledarja in jih "
-"samodejno prenesla v novo mapo poslov."
+"Evolucija je vzela posle, ki so bili v va�i mapi koledarja in jih samodejno "
+"prenesla v novo mapo poslov."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3183,8 +3047,8 @@ msgid ""
 msgstr ""
 "Evolucija je posku�ala vzeti vse posle, ki so bili v va�i mapi koledarja in "
 "jih prenesti v novo mapo poslov.\n"
-"Nekaterih poslov ni bilo mogo�e prenesti, zato bo ta proces v prihodnosti "
-"�e ponovljen."
+"Nekaterih poslov ni bilo mogo�e prenesti, zato bo ta proces v prihodnosti �e "
+"ponovljen."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3192,7 +3056,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prene�en v mapo poslov."
+"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prene�en v mapo "
+"poslov."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3200,8 +3065,8 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"Metoda potrebna za nalo�itev `%s' ni podprta; predmeti iz mape koledarja "
-"ne bodo prene�eni v mapo poslov."
+"Metoda potrebna za nalo�itev `%s' ni podprta; predmeti iz mape koledarja ne "
+"bodo prene�eni v mapo poslov."
 
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
@@ -3222,7 +3087,7 @@ msgstr "Napaka ob izvajanju filtra: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3231,7 +3096,7 @@ msgstr ""
 "Nisem mogel raz�leniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3240,16 +3105,16 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pri�akovan niz"
 
@@ -3331,47 +3196,47 @@ msgstr "Program movemail ni uspel: %s"
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel nalo�iti %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 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:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "stre�nik %s %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s stre�nikom je bila nepri�akovano prekinjena"
 
@@ -3389,6 +3254,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:118
+#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -3397,10 +3263,12 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:130
+#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
-msgstr "Neveljavni podati sledenja:\n"
+msgstr ""
+"Neveljavni podati sledenja:\n"
 "%s"
 
 #: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
@@ -3424,8 +3292,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Ta mo�nost narekuje povezavo s stre�nikom z uporabo varnega DIGEST-MD5 gesla, "
-"�e to podpira stre�nik."
+"Ta mo�nost narekuje povezavo s stre�nikom z uporabo varnega DIGEST-MD5 "
+"gesla, �e to podpira stre�nik."
 
 #: camel/camel-sasl-digest-md5.c:761
 msgid "Server challenge too long (>2048 octets)\n"
@@ -3437,7 +3305,9 @@ msgstr "Stre�nikov izziv ni veljaven\n"
 
 #: camel/camel-sasl-digest-md5.c:776
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Stre�nikov izziv je vseboval neveljaven �len \"Quality of Protection\" (kvaliteta za��ite)\n"
+msgstr ""
+"Stre�nikov izziv je vseboval neveljaven �len \"Quality of Protection\" "
+"(kvaliteta za��ite)\n"
 
 #: camel/camel-sasl-digest-md5.c:798
 msgid "Server response did not contain authorization data\n"
@@ -3470,7 +3340,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Stre�nik je sporo�il slab odgovor avtentifikaciji."
 
@@ -3482,8 +3352,9 @@ msgstr "�ISTO"
 msgid ""
 "This option will connect to the server using a the PLAIN SASL mechanism if "
 "the server supports it."
-msgstr "Ta mo�nost narekuje povezavo s stre�nikom z uporabo �ISTEGA SASL mehanizma,"
-"�e stre�nik to podpira."
+msgstr ""
+"Ta mo�nost narekuje povezavo s stre�nikom z uporabo �ISTEGA SASL "
+"mehanizma,�e stre�nik to podpira."
 
 #: camel/camel-search-private.c:105
 #, c-format
@@ -3523,12 +3394,12 @@ msgstr "Nuditelj virutalne mape e-po�te"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje po�te kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3537,6 +3408,12 @@ msgstr ""
 "Nisem mogel ustvariti imenika %s:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+msgid "Trash"
+msgstr "Smeti"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3552,7 +3429,7 @@ msgstr "URL niz '%s' vsebuje neveljaven protokol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "�tevilka vrat v URL '%s' ni numeri�na"
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni tak�nega sporo�ila: %s"
@@ -3607,30 +3484,42 @@ 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:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "Za branje in hranjenje po�te na IMAP stre�nikih."
+
+#: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta mo�nost narekuje povezavo s stre�nikom IMAP z ne�ifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:407
+#: camel/providers/imap/camel-imap-store.c:415
+#, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Stre�nik IMAP %s ne podpira zahtevanega na�ina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za na�in avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpi�ite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3641,7 +3530,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
@@ -3876,7 +3765,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1313
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
@@ -4044,6 +3933,21 @@ msgstr ""
 "prena�anje po�te iz nekaterih spletnih nuditeljev po�te in zaprtih sistemov "
 "e-po�te."
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Za povezovanje s stre�niki POP. POP protokol se lahko uporabi tudi za "
+"prena�anje po�te iz nekaterih spletnih nuditeljev po�te in zaprtih sistemov "
+"e-po�te."
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -4115,7 +4019,7 @@ msgstr ""
 "Nisem se mogel povezati s stre�nikom POP.\n"
 "Napaka ob po�iljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni tak�ne mape `%s'."
@@ -4167,11 +4071,11 @@ msgstr "program sendmail je zaklju�il s stanjem %d: po�ta ni bila poslana."
 msgid "Could not find 'From' address in message"
 msgstr "V sporo�ilu nisem na�el naslova 'From' (po�iljatelja)."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava po�te preko programa sendmail"
 
@@ -4185,120 +4089,134 @@ msgstr ""
 "Za dostavo po�te preko povezave z oddaljenim po�tnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"Za dostavo po�te preko povezave z oddaljenim po�tnim razdelilcem z uporabo "
+"SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Sintakti�na napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakti�na napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomo�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Spor�ilo pomo�i"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano po�tno dejanje ni bilo izvedeno: po�tni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: po�tni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekora�ena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime po�tnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Za�ni z vpisom po�te; kon�aj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je pre�ibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno �ifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Za�asna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Napaka pri pozdravu: %s: morda ni usodna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpi�ite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Avtentifikacija ni potrebna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4306,109 +4224,110 @@ msgstr ""
 "Ta mo�nost narekuje povezavo s stre�nikom SMTP brez uporabe avtentifikacije. "
 "To bi moralo biti v redu za povezavo z ve�ino stre�niki SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "Stre�nik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava po�te s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Ne morem poslati sporo�ila: naslov po�iljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporo�ila: naslov po�iljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporo�ila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zahtevek HELO je prekora�il �asovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekora�il �asovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr "Stre�nik je sporo�il slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekora�il �asovno omejitev: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na MAIL FROM: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekora�il �asovno omejitev: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekora�il �asovno omejitev: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekora�il �asovno omejitev: konec sporo�ila: %s: po�ta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: konec sporo�ila: %s: po�ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekora�il �asovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zahtevek QUIT je prekora�il �asovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
@@ -4447,11 +4366,6 @@ msgstr "priloga"
 msgid "Attach a file"
 msgstr "Prilo�i datoteko"
 
-#: 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
-msgid "Remove"
-msgstr "Odstrani"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
@@ -4501,33 +4415,40 @@ msgid "From:"
 msgstr "Od:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporo�ila"
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 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:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4558,12 +4479,12 @@ msgstr "Napaka ob shranjevanju datoteke: %s"
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4573,27 +4494,27 @@ msgstr ""
 "\n"
 "�elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "To ni obi�ajna datoteka."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 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:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4601,15 +4522,15 @@ msgstr ""
 "Datoteka je zelo velika (�ez 100K).\n"
 "Ste prepri�ani,da jo �elite vstaviti?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Sestavi novo sporo�ilo"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
@@ -4625,6 +4546,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolucijino programje za delo v skupini"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "vizitka"
@@ -4959,29 +4884,20 @@ msgstr "sedaj"
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "Filtru dodaj pravilo"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Uredi pravilo filtra"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Uredi filtre"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Pravila filtriranja"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Odstrani dejanje"
 
@@ -5018,35 +4934,35 @@ msgstr ""
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "�e"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Izvr�i dejanja"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "�e je zado��eno vsem pogojem"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "�e je zado��eno kateremukoli pogoju"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
@@ -5054,8 +4970,8 @@ msgstr "Odstrani pogoj"
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Pomembno"
@@ -5064,14 +4980,14 @@ msgstr "Pomembno"
 msgid "Read"
 msgstr "Beri"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Uredi filtre"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Dohodna"
@@ -5080,7 +4996,7 @@ msgstr "Dohodna"
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
@@ -5104,237 +5020,197 @@ msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Odgovorjeno"
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Pripi�i barvo"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Pripi�i to�ke"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Priloga"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "vsebuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Zbrisano"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Osnutek"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "se ne kon�a z"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "se ne za�ne z"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "se kon�a z"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "Izhod"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "obstaja"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "Ozna�eno"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Posreduj na naslove"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "je ve�je"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "je manj�e"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "ni"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "Jedro sporo�ila"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Glava sporo�ila"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Sporo�ilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Sporo�ilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "na ali po"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "na ali pred"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "Videno"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "To�ke"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Postavi ozna�bo"
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "Dolo�ena glava"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "se za�ne z"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "ne vsebuje"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "se ne kon�a z"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "se ne za�ne z"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "se kon�a z"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "je ve�je"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "je manj�e"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "ni"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr "ustreza regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "na ali po"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "na ali pred"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "se za�ne z"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "je bilo pred"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Dodaj pravilo"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Uredi pravilo to�k"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Dodaj pravilo vMape"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Uredi pravilo vMape"
-
-#: mail/component-factory.c:303
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za po�to."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-factory.c:213
+#: mail/folder-browser-factory.c:237
+#, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Lastnosti"
@@ -5343,81 +5219,81 @@ msgstr "Lastnosti"
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "vMapa glede na Po�iljatelja"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na Po�tni seznam"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filter glede na Po�iljatelja"
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filter glede na Prejemnike"
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Po�tni seznam"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:30 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Natisni"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Odgovori po�iljatelju"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Posreduj naprej kot del sporo�ila"
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Ozna�i kot prebrano"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Ozna�i kot neprebrano"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Odbri�i"
 
@@ -5425,20 +5301,20 @@ msgstr "Odbri�i"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Iz sporo�ila ustvari pravilo"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po�tni seznam (%s)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Po�tni seznam (%s)"
@@ -5475,22 +5351,6 @@ msgstr "Tovarna za Evolucijino komponento po�te."
 msgid "Factory for the Mail Summary component."
 msgstr "Tovarna za komponento povzetka po�te."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Tovarna za uvoz po�te Outlook Express 4 v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Uvozi mbox daoteke v Evolucijo"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
@@ -5579,6 +5439,10 @@ msgstr "Po�ta od %s"
 msgid "%s mailing list"
 msgstr "%s po�tnih seznamov"
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Filtru dodaj pravilo"
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5672,7 +5536,7 @@ msgstr "Shrani sporo�ilo kot..."
 msgid "Save Messages As..."
 msgstr "Shrani sporo�ila kot..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5681,11 +5545,11 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Natisni sporo�ilo"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Tiskanje sporo�ila ni uspelo"
 
@@ -5940,7 +5804,7 @@ msgstr ""
 "Kliknite \"Naprej\" za za�etek. "
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "_Uredi"
@@ -6016,10 +5880,6 @@ msgstr "Skrij"
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
 #: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporo�ila"
@@ -6070,6 +5930,7 @@ msgid "Malformed external-body part."
 msgstr "Napa�no oblikovano dodatno telo sporo�ila."
 
 #: mail/mail-local.c:335
+#, c-format
 msgid "No such folder %s"
 msgstr "Ni tak�ne mape %s"
 
@@ -6144,15 +6005,15 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:666
+#: mail/mail-mt.c:666 mail/session.c:91
 msgid "Do you accept?"
 msgstr "Sprejemate?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Napredek evolucije"
 
@@ -6165,75 +6026,75 @@ msgstr "Po�iljam \"%s\""
 msgid "Sending message"
 msgstr "Po�iljam sporo�ilo"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "Shranjujem sporo�ilo v mapo"
 
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporo�ila v %s"
 
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:825
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporo�ia v %s"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:852
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporo�ilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve�ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1070
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Posredovana sporo�ila"
 
-#: mail/mail-ops.c:1111 mail/mail-ops.c:1249
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1178
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Uni�ujem mapo"
 
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prena�am sporo�ilo %s"
 
-#: mail/mail-ops.c:1481
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Prena�am sporo�ilo"
 
-#: mail/mail-ops.c:1491
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Prena�am sporo�ilo �tevilka %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Shranjujem sporo�ila"
 
-#: mail/mail-ops.c:1644
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6242,12 +6103,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Shranjujem sporo�ilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6256,11 +6117,11 @@ msgstr ""
 "Napaka ob shranjevanju sporo�il v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6269,7 +6130,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1788
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
@@ -6356,23 +6217,23 @@ 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 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Odgovori po�iljatelju tega sporo�ila"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporo�ila"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Sporo�ilo posreduj naprej"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporo�ilo"
 
@@ -6384,6 +6245,14 @@ msgstr "Zbri�i to spor�ilo"
 msgid "Unseen"
 msgstr "Nevideno"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "Videno"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Odgovorjeno"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "ve� nevidenih sporo�il"
@@ -6431,6 +6300,10 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Ozna�eno"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Od"
@@ -6798,7 +6671,7 @@ msgstr "%s - Evolucija %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6885,7 +6758,7 @@ msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bli�njic."
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Pogled"
@@ -6946,7 +6819,8 @@ msgstr "Izbran tip ni podprt v tem hranilniku"
 msgid "The Evolution shell."
 msgstr "Evolucijina lupina."
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6973,7 +6847,8 @@ msgstr ""
 "verjetno zato, ker tega zaenkrat �e ni mo�no narediti. :-)\n"
 "\n"
 "Upamo, da vam bo Evolucija uporabna, a �e vedno vas moramo opozoriti, da se\n"
-"lahko: sesuje, izgubi va�o po�to, pusti te�i mrtve procese, porabi 100% va�ega\n"
+"lahko: sesuje, izgubi va�o po�to, pusti te�i mrtve procese, porabi 100% "
+"va�ega\n"
 "procesorskega �asa, po�lje neveljavne ukaze na va�e stre�nike in vas na\n"
 "splo�no osramoti pred prijatelji in sodelavci. Uporabljajte jo le tako \n"
 "kot je predvideno.\n"
@@ -6981,7 +6856,7 @@ msgstr ""
 "Upamo, da boste u�ivali sadove na�ega trdega dela in nestrpno\n"
 "pri�akujemo va�e prispevke!\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6989,15 +6864,15 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne morem inicializirati lupine Evolucije."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Izklju�eno."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -7022,7 +6897,7 @@ msgid "New contact"
 msgstr "Nov stik"
 
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Predogled sporo�ika, ki bo natisnjeno"
 
@@ -7030,7 +6905,7 @@ msgstr "Predogled sporo�ika, ki bo natisnjeno"
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Ustavi"
 
@@ -7064,7 +6939,7 @@ msgid "_Search for contacts"
 msgstr "_I��i po kontaktih"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:75
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Orodja"
@@ -7184,7 +7059,7 @@ msgstr "_Nova"
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:72
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Shrani kot..."
@@ -7211,7 +7086,7 @@ msgid "Print this item"
 msgstr "Natisni ta predmet"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:34 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Natisni..."
 
@@ -7243,13 +7118,13 @@ msgid "Send _message to contact..."
 msgstr "Po�lji _sporo�ilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Datoteka"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Shrani"
@@ -7388,7 +7263,7 @@ msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Shrani"
 
@@ -7425,12 +7300,12 @@ msgstr "Nastavi lastnosti strani za va� trenutni tiskalnik"
 msgid "Task _Request (FIXME)"
 msgstr "Zahtevek opravila (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_O..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Zapri"
@@ -7444,12 +7319,12 @@ msgstr "_Kontakt (FIXME)"
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Razhro��uj"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Pomo�"
@@ -7487,7 +7362,7 @@ msgstr "_Prilepi"
 msgid "_Print"
 msgstr "_Natisni"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Lastnosti..."
@@ -7546,206 +7421,211 @@ msgid "Display all of the message headers"
 msgstr "Ka�i vse glave sporo�il"
 
 #: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Prazni dnevi:"
+
+#: ui/evolution-mail.xml.h:11
 msgid "Filter on Se_nder"
 msgstr "Filter glede na _po�iljatelja"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:12
 msgid "Filter on _Recipients"
 msgstr "Filter glede na _prejemnike"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:13
 msgid "Filter on _Subject"
 msgstr "Filter glede na _zadevo"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:16
 msgid "Forward As"
 msgstr "Posreduj kot"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:18
 msgid "Full Headers"
 msgstr "Polne glave"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Skrij _izbrana sporo�ila"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporo�ila"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "Skrij _prebrana sporo�ila"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 msgid "Inline"
 msgstr "Znotraj"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Manage _Subscriptions..."
 msgstr "Uredi _naro�nine..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mar_k as Read"
 msgstr "Ozna�i kot _prebrano"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Mark All as R_ead"
 msgstr "Ozna�i _vse kot prebrano"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Mark as U_nread"
 msgstr "Ozna�i kot _neprebrano"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Message _Display"
 msgstr "Prikaz _sporo�ila"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Prestavi sporo�ilo v novo mapo"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Natisni sporo�ilo na tiskalniku"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:36
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:37
 msgid "Redirect (FIXME: implement me)"
 msgstr "Preusmeri (FIXME: implementiraj me)"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "_Vir"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:45
 msgid "Select _Thread"
 msgstr "Izberi _nit"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
 msgid "Send and Receive"
 msgstr "Oddaja in sprejem"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Po�lji po�to v vrsti in sprejmi novo po�to"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:48
 msgid "Show _All"
 msgstr "Ka�i _vse"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Niten seznam sporo�il"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _po�iljatelja"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _sprejemnike"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na _predmet"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Glej izvorno obliko sporo�ila"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Compose"
 msgstr "_Sestavi"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:60
 msgid "_Create Filter From Message"
 msgstr "Iz sporo�ila ustvari _pravilo"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Uni�i"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:63
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:67
 msgid "_Mail Message"
 msgstr "_Po�lji sporo�ilo"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:68
 msgid "_Mail Settings..."
 msgstr "_Nastavive po�te..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:69
 msgid "_Message Hiding"
 msgstr "_Skrivanje sporo�ila"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Prestavi v mapo..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:71
 msgid "_Open Selected Items"
 msgstr "Odpri izbrane predmete"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:74
 msgid "_Send and Receive"
 msgstr "_Oddaja in sprejem"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Odbri�i"
 
@@ -7866,31 +7746,41 @@ msgstr "Preklopi prikaz polja CC"
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Preklopi prikaz izbirnika Od"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Preklopi prikaz polja CC"
+
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Odpri..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Odgovori-na:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Varnost"
 
@@ -8213,6 +8103,11 @@ msgstr "�as zaklju�ka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udele�eni"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "Pogled vizitke"
+
 #. 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
@@ -8269,15 +8164,15 @@ msgstr "�as ni veljaven"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Napredno ..."
 
@@ -8326,9 +8221,142 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolucijino programje za delo v skupini"
+#~ msgid "Disabled"
+#~ msgstr "Izklju�eno"
+
+#~ msgid "Synchronize"
+#~ msgstr "Uskladi"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopiraj iz Pilota"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopiraj na Pilota"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Zlij iz Pilota"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Zlij na Pilota"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Prvotni avtor:"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolucijin adresarjev veznik"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 Fundacija za prosto programje in Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Uskladi dejanje"
+
+#~ msgid "Conduit state"
+#~ msgstr "Stanje veznika"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Noben Pilot ni nastavljen, prosim najprej izberite\n"
+#~ "'Lastnosti povezave s Pilotom' nastavitveni vstavek."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Nisem povezaqn z gnome-pilot daemonom"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Ob prena�anju seznama pilotov z gnome-pilot\n"
+#~ "daemona se je zgodila napaka"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Nastavi veznik adresarja"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Evolucijin veznik adresarja "
+
+#~ msgid "label26"
+#~ msgstr "ozna�ba26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolucijin veznik koledarja"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "Nastavi veznik GnomeCal"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Evolucijin veznik Koledarja"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Nastavi veznik za-opravit"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Evolucijin veznik za-opravit"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolucijin veznik za-opravit"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
+
+#~ msgid "label21"
+#~ msgstr "ozna�ba21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Uredi pravilo filtra"
+
+#~ msgid "Deleted"
+#~ msgstr "Zbrisano"
+
+#~ msgid "Draft"
+#~ msgstr "Osnutek"
+
+#~ msgid "Set Flag"
+#~ msgstr "Postavi ozna�bo"
+
+#~ msgid "matches regex"
+#~ msgstr "ustreza regularnemu izrazu"
+
+#~ msgid "Add Rule"
+#~ msgstr "Dodaj pravilo"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Dodaj pravilo vMape"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Uredi pravilo vMape"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Tovarna za uvoz po�te Outlook Express 4 v Evolucijo"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Uvozi mbox daoteke v Evolucijo"
 
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteta mora biti med vklju�no 1 in 9"
@@ -8447,9 +8475,6 @@ msgstr "Evolucijino programje za delo v skupini"
 #~ msgid "Customi_ze..."
 #~ msgstr "_Prilagodi..."
 
-#~ msgid "Exit"
-#~ msgstr "Izhod"
-
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Ka�i vrstico z _mapami"
 
@@ -8468,9 +8493,6 @@ msgstr "Evolucijino programje za delo v skupini"
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#~ msgid "Trash"
-#~ msgstr "Smeti"
-
 #~ msgid "Body or subject contains"
 #~ msgstr "Telo ali zadeva vsebuje"
 
@@ -8936,9 +8958,6 @@ msgstr "Evolucijino programje za delo v skupini"
 #~ msgid "Headings:"
 #~ msgstr "Zaglavja:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Prazni dnevi:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Osvetljen dan:"
 
diff --git a/po/sv.po b/po/sv.po
index 31901472c5..64e1b961b0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,12 @@
 # Christian Rose <menthos@menthos.com>, 2000-2001.
 # Martin Norb�ck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.63 2001/03/15 01:21:38 menthos Exp $
+# $Id: sv.po,v 1.64 2001/03/15 10:42:17 pablo Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-03-15 02:17+0100\n"
+"POT-Creation-Date: 2001-03-15 11:10+0100\n"
 "PO-Revision-Date: 2001-03-15 02:18+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -952,7 +952,7 @@ msgstr "Adressboksk�llor"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1464,7 +1464,7 @@ msgstr "Konfidentiellt"
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Ok�nt"
 
@@ -2260,7 +2260,7 @@ msgid "New Appointment..."
 msgstr "Nytt m�te..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "�ppna"
@@ -3028,7 +3028,7 @@ msgstr "Aktuellt �r (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
 #: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
@@ -3202,12 +3202,12 @@ msgstr "Programmet movemail misslyckades: %s"
 msgid "(Unknown error)"
 msgstr "(Ok�nt fel)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte l�sa in %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte l�sa in %s: Ingen initieringskod i modulen."
@@ -3227,7 +3227,7 @@ msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
 #: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
@@ -3399,12 +3399,12 @@ msgstr "E-postleverant�r f�r virtuell mapp"
 msgid "For reading mail as a query of another set of folders"
 msgstr "F�r l�sande av e-post som en fr�ga av en annan samling mappar"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverant�r f�r protokollet \"%s\""
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3489,6 +3489,16 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "F�r l�sande och lagrande av e-post p� IMAP-servrar."
 
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "F�r l�sande och lagrande av e-post p� IMAP-servrar."
+
 #: camel/providers/imap/camel-imap-store.c:263
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -3510,12 +3520,12 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVar v�nlig och ange IMAP-l�senordet f�r %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr "Du angav inte n�got l�senord."
 
 #: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3931,6 +3941,20 @@ msgstr ""
 "F�r anslutning till POP-servrar. POP-protokollet kan �ven anv�ndas f�r att "
 "h�mta e-post fr�n vissa webb-epostleverant�rer och slutna e-postsystem."
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"F�r anslutning till POP-servrar. POP-protokollet kan �ven anv�ndas f�r att "
+"h�mta e-post fr�n vissa webb-epostleverant�rer och slutna e-postsystem."
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -4003,7 +4027,7 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av l�senord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
@@ -4073,121 +4097,134 @@ msgstr ""
 "F�r leverans av e-post genom anslutning till ett fj�rr-epostnav som anv�nder "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"F�r leverans av e-post genom anslutning till ett fj�rr-epostnav som anv�nder "
+"SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfel, ok�nt kommando"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfel i parametrar eller argument"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter inte implementerad"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar fr�n systemhj�lp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Hj�lpmeddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Tj�nsten klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Tj�nsten st�nger �verf�ringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Tj�nsten inte tillg�nglig, st�nger �verf�ringskanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "Efterfr�gad e-post�tg�rd okej, f�rdig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Anv�ndaren inte lokal; vidarebefordrar till <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Efterfr�gad e-post�tg�rd inte utf�rd: brevl�dan inte tillg�nglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Efterfr�gad �tg�rd inte utf�rd: brevl�dan inte tillg�nglig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "Efterfr�gad �tg�rd avbruten: fel i behandling"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Anv�ndaren inte lokal; f�rs�k med <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Efterfr�gad �tg�rd inte utf�rd: otillr�ckligt systemutrymme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Efterfr�gad �tg�rd avbruten: �verskriden utrymmesallokering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Efterfr�gad �tg�rd inte utf�rd: brevl�denamn inte till�tet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "B�rja skriva in brevet, avsluta med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "Transaktionen misslyckades"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr "En l�senords�verf�ring beh�vs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen �r f�r svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering beh�vs f�r beg�rd autentiseringsmekanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Tillf�lligt autentiseringsmisslyckande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Autentisering kr�vs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fel p� v�lkomstsvar: %s: m�jligtvis inte �desdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVar v�nlig och ange SMTP-l�senordet f�r %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Ingen autentisering kr�vs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4195,105 +4232,105 @@ msgstr ""
 "Detta alternativ kommer att ansluta till SMTP-servern utan n�gon form av "
 "autentisering. Detta b�r fungera f�r anslutning till de flesta SMTP-servrar."
 
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan inte skicka meddelande: avs�ndaradressen �r inte angiven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avs�ndaradressen �r inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare �r angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO-beg�ran gjorde time-out: %s: inte �desdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte �desdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-beg�ran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar fr�n servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM-beg�ran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO-beg�ran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fel i RCPT TO-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-beg�ran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fel i DATA-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA-skickande gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fel i DATA-svar: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-beg�ran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-beg�ran gjorde time-out: %s: inte �desdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fel i QUIT-svar: %s: inte �desdigert"
@@ -4445,7 +4482,7 @@ msgstr "Fel vid sparande av filen: %s"
 msgid "Error loading file: %s"
 msgstr "Fel vid inl�sning av filen: %s"
 
-#: composer/e-msg-composer.c:818 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
@@ -4512,6 +4549,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Grupprogramvaran Evolution"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adresskort"
@@ -4846,29 +4887,20 @@ msgstr "nu"
 msgid "<click here to select a date>"
 msgstr "<klicka h�r f�r att v�lja ett datum>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "L�gg till filterregel"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Redigera filterregel"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redigera filter"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filterregler"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "D�"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "L�gg till �tg�rd"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Ta bort �tg�rd"
 
@@ -4906,35 +4938,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Namnl�s"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Utf�r �tg�rder"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "om n�got villkor uppfylls"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "L�gg till villkor"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Ta bort villkor"
 
@@ -4952,14 +4984,14 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "L�s"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Redigera filter"
+
 #: 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"
@@ -4968,7 +5000,7 @@ msgstr "Inkommande"
 msgid "Outgoing"
 msgstr "Utg�ende"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
@@ -5161,22 +5193,11 @@ msgstr "var efter"
 msgid "was before"
 msgstr "var f�re"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "L�gg till regel"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Redigera po�ngregel"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "L�gg till regel f�r virtuell mapp"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Redigera regel f�r virtuell mapp"
-
 #: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
@@ -5199,81 +5220,81 @@ msgstr "Egenskaper"
 msgid "Store search as vFolder"
 msgstr "Lagra s�kning som vMapp"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp p� �mnesrad"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp p� avs�ndare"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp p� mottagare"
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "Virtuell mapp p� s�ndlista"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Filtrera p� �mnesrad"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "Filtrera p� avs�ndare"
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Filtrera p� mottagare"
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "Filtrera p� s�ndlista"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
 #: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Svara till avs�ndaren"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "M�rk som l�st"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "M�rk som ol�st"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "�ngra borttagning"
 
@@ -5281,20 +5302,20 @@ msgstr "�ngra borttagning"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Till�mpa filter"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Skapa regel fr�n meddelande"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera p� s�ndlista (%s)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Virtuell mapp p� s�ndlista (%s)"
@@ -5419,6 +5440,10 @@ msgstr "H�mta e-post fr�n %s"
 msgid "%s mailing list"
 msgstr "S�ndlistan %s"
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "L�gg till filterregel"
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5512,7 +5537,7 @@ msgstr "Spara meddelande som..."
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5521,11 +5546,11 @@ msgstr ""
 "Fel vid l�sning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
@@ -5979,7 +6004,7 @@ msgstr ""
 "Fel vid utf�rande av operation:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "Jobbar"
 
@@ -5987,7 +6012,7 @@ msgstr "Jobbar"
 msgid "Do you accept?"
 msgstr "Accepterar du?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr "Evolutionf�rlopp"
 
@@ -6793,8 +6818,8 @@ msgstr "Den angivna typen st�ds inte i detta lager"
 msgid "The Evolution shell."
 msgstr "Evolutionskalet."
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6832,7 +6857,7 @@ msgstr ""
 "Vi hoppas att du gl�ds �t resultatet av v�rt h�rda arbete, och vi\n"
 "inv�ntar med sp�nning dina bidrag!\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6840,15 +6865,15 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan inte initiera Evolutionskalet."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "St�ng av."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -7239,7 +7264,7 @@ msgid "Print Setup"
 msgstr "Skrivarinst�llningar"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Spara"
 
@@ -8136,15 +8161,15 @@ msgstr "Tiden �r ogiltig"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Spara s�kning"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Avancerad s�kning"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Avancerat..."
 
@@ -8193,9 +8218,17 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Grupprogramvaran Evolution"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Redigera filterregel"
+
+#~ msgid "Add Rule"
+#~ msgstr "L�gg till regel"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "L�gg till regel f�r virtuell mapp"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Redigera regel f�r virtuell mapp"
 
 #~ msgid "Disabled"
 #~ msgstr "Avst�ngd"
diff --git a/po/tr.po b/po/tr.po
index 3f981f8767..69401645cb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-08 20:06+0100\n"
+"POT-Creation-Date: 2001-03-15 11:05+0100\n"
 "PO-Revision-Date: 2001-03-08 20:07+0100\n"
 "Last-Translator: G�rkem �etin <gorkem@gelecek.com.tr>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -310,132 +310,13 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
 #: calendar/gui/alarm-notify/notify-main.c:68 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.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Etkisiz"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "E�zamanla"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Pilot'tan Kopyala"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Pilot'a Kopyala"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Pilot'tan Birle�tir"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Pilot'a Birle�tir"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Programc�(lar):"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution Adres Defteri"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 Free Software Foundation ve Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution adres defteri yap�land�rma program�\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "��lemi E�zamanla"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ayarl� pilot yok. L�tfen 'Pilot Ba�lant�\n"
-"�zellikleri' b�l�m�ne gidiniz."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot program�na ba�lant� kurulmad�"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"gnome-pilot program�ndan pilot listesi\n"
-"al�n�rken bir hata olu�tu"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "�mle� y�klenemedi\n"
@@ -461,14 +342,6 @@ msgstr "Wombat ba�lat�lamad�"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamad�"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Adres par�as�n�n ayarlar�"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Adres par�as�"
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -531,7 +404,7 @@ msgid "Phone Types"
 msgstr "Telefon T�rleri"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Birincil E-posta Adresi"
 
@@ -570,7 +443,7 @@ msgstr "�_irket:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
 #: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -622,113 +495,132 @@ msgstr "_Bu mektupla�ma adresidir"
 msgid "Delete Contact?"
 msgstr "Ba�lant�y� Sil?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Yard�mc�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "2. Meslek"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "��yeri Faks�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Geri Arama"
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Araba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "�irket"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "2. ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Ev Faks�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Cep"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Di�er"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Ba�ka Fakslar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "�a�r� Cihaz�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "�lk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "2. E-posta Adresi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Filtreleri D�zenle"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Tam �sim:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "E-posta"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "_2. Adres:"
@@ -923,7 +815,7 @@ msgid "None (anonymous mode)"
 msgstr "Hi�biri (anonim kipi)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -1052,7 +944,7 @@ msgstr "Adres Defteri Kaynaklar�"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1074,31 +966,47 @@ msgstr "�sim"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Di�er Ba�lant�lar"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#, fuzzy
+msgid "A Bonobo control for displaying an address."
 msgstr "Adres defteri g�steren �rnek bir Bonobo denetleyici"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Adres defteri g�steren �rnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution adres defteri mini kart�n� g�steren denetleyici."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adres Defteri mini kart g�r�nt�leyici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Ba�lant�lar� d�zenleyen Evolution bile�eni."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Adres defteri mini kart mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Adres defteri isim se�im aray�z� mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Evolution adres defteri bile�en mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "�rnek adres defteri kontrol mimarisi"
 
@@ -1110,6 +1018,21 @@ msgstr "Evolution adres defteri isim se�me aray�z�."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres defteri isim se�im aray�z� mimarisi"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: 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
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Bul..."
@@ -1486,18 +1409,6 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "Geni�lik:"
 
-#: 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 "Evolution Takvimi"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution takvimi i�in yap�land�rma program�\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1508,30 +1419,6 @@ msgstr "Takvim sunucusuyla ileti�imde hata olu�tu"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama blo�u okunamad�"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "GnomeCal takvim par�as� ayarlar�"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Takvim par�as�"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Yap�lacaklar par�as� ayarlar�"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Yap�lacaklar par�as�"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution Yap�lacaklar"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolution Yap�lacaklar i�in yap�land�rma program�.\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
@@ -1571,7 +1458,7 @@ msgstr "Gizli"
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
@@ -1961,8 +1848,7 @@ msgid "Pick a color"
 msgstr "Bir renk se�in"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "�ncelik"
 
@@ -2364,7 +2250,7 @@ msgid "New Appointment..."
 msgstr "Yeni Randevu..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "A�"
@@ -2460,6 +2346,7 @@ msgid "Cancel Meeting"
 msgstr "Toplant�y� �ptal Et"
 
 #: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
 msgid "%P %%"
 msgstr "%P %% "
 
@@ -2483,8 +2370,7 @@ msgstr "Takvim y�kleniyor..."
 msgid "Organizer:"
 msgstr "Kurum:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "G�nderen"
 
@@ -2574,8 +2460,8 @@ msgstr ""
 "Zaman�\n"
 "D�zenle"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Durum"
 
@@ -2697,14 +2583,12 @@ msgstr "B_a�lang�� tarihi:"
 msgid "_Starting date:"
 msgstr "_Ba�lang�� g�n�:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "�nce"
 
@@ -2729,34 +2613,26 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "dakika"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "ay"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "randevu ba�lang�c�"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "tarihe kadar"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "hafta"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "y�l"
 
@@ -3140,9 +3016,9 @@ msgstr "Ge�erli y�l (%Y)"
 msgid "Print Calendar"
 msgstr "Takvimi Yazd�r"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1245
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "�nizlemeyi Yazd�r"
 
@@ -3180,8 +3056,8 @@ msgstr ""
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
-"The method required to load `%s' is not supported; no items from the calendar "
-"folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr "`%s' y�klemek i�in gereken y�ntem desteklemiyor."
 
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
@@ -3203,7 +3079,7 @@ msgstr "%s filtresini �al��t�r�rken hata oldu: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramas�n� �al��t�r�rken hata oldu: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3212,7 +3088,7 @@ msgstr ""
 "Arama deyimi ayr��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3221,16 +3097,16 @@ msgstr ""
 "Arama deyimi �al��t�r�lamad�: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(hepsini-e�le) boolean sonu� i�ermelidir"
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen ba�l�k �zerinde arama yap�l�yor: %s"
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "G�vde i�eri�inde ge�ersiz t�r. Dizgi bekleniyordu"
 
@@ -3312,47 +3188,47 @@ msgstr "Movemail program�nda hata: %s"
 msgid "(Unknown error)"
 msgstr "(Bilinmeyen hata)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s y�klenemedi: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s y�klenemedi: Mod�lde ba�lang�� kodu bulunamad�"
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s sunucu %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s i�in %s �zerindeki %s servisi"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Ba�lant� iptal edildi"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine ba�lant� kurulamad� (%d): %s"
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(bilinmeyen makine)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "��lem iptal edildi"
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr "Sunucu beklenmedik bir �ekilde ba�lant�y� kesti"
 
@@ -3368,6 +3244,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-anonymous.c:118
+#, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -3376,6 +3253,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:130
+#, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
@@ -3399,8 +3277,8 @@ msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:39
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, if "
-"the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
 msgstr ""
 "Bu se�enek sunucuya g�venli DIGEST-MD5 sistemi ile ba�lant� kuracakt�r. "
 
@@ -3433,8 +3311,7 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:40
-msgid ""
-"This option will connect to the server using Kerberos 4 authentication."
+msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Bu se�enek sunucuya Kerberos 4 kimlik denetimi ile ba�lanacakt�r."
 
 #: camel/camel-sasl-kerberos4.c:158
@@ -3447,7 +3324,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�."
 
@@ -3460,8 +3337,8 @@ msgid ""
 "This option will connect to the server using a the PLAIN SASL mechanism if "
 "the server supports it."
 msgstr ""
-"Bu se�enek IMAP sunucusuna D�Z SASL y�ntemi kullan�larak ba�lant� kurulmas�n� "
-"sa�lar."
+"Bu se�enek IMAP sunucusuna D�Z SASL y�ntemi kullan�larak ba�lant� "
+"kurulmas�n� sa�lar."
 
 #: camel/camel-search-private.c:105
 #, c-format
@@ -3501,12 +3378,12 @@ msgstr "Sanal dizin e-posta sa�lay�c�s�"
 msgid "For reading mail as a query of another set of folders"
 msgstr "di�er bir dizin listesinden al�nan iletileri okumak i�in"
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokol� i�in al�c� yok"
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3515,6 +3392,13 @@ msgstr ""
 "%s dizini yarat�lamad�:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "G�rev"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3530,7 +3414,7 @@ msgstr "%s URL sat�r� hatal� protokol i�ermiyor"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "%s adresindeki port numaras� bir say� de�il"
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr "Bu isimle bir ileti yok: %s"
@@ -3585,33 +3469,44 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP sunucular� ileti alma ve g�ndermede kullanmak i�in"
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#, fuzzy
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "IMAP sunucular� ileti alma ve g�ndermede kullanmak i�in"
+
+#: camel/providers/imap/camel-imap-store.c:263
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu se�enek IMAP sunucusuna a��k metin parola kullanarak ba�lant� kurulmas�n� "
 "sa�lar."
 
-#: camel/providers/imap/camel-imap-store.c:407
+#: camel/providers/imap/camel-imap-store.c:415
+#, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP sunucusu %s kimlik s�nama y�ntemini desteklemiyor"
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik s�nama y�ntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sL�tfen %s@%s i�in IMAP parolas�n� giriniz"
 
-#: camel/providers/imap/camel-imap-store.c:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3622,7 +3517,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yarat�lamad�: %s"
@@ -3839,7 +3734,7 @@ msgstr "`%s' dizini bo� de�il. Silinmedi."
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:240
 msgid "Summarising folder"
-msgstr "Dizin �zeti ��kart�l�yor" 
+msgstr "Dizin �zeti ��kart�l�yor"
 
 #: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
@@ -3857,7 +3752,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Dizin �zeti ��kart�lamad�: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1309
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Dizin e�zamanl� hale getiriliyor"
 
@@ -4004,6 +3899,7 @@ msgid "No message with uid %s"
 msgstr "%s kullan�c� numaras�yla ileti yok"
 
 #: camel/providers/pop3/camel-pop3-folder.c:286
+#, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mesaj� al�n�yor"
 
@@ -4022,6 +3918,18 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr "POP sunucuya ba�lant� kurmak i�in."
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr "POP sunucuya ba�lant� kurmak i�in."
+
 #: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -4033,8 +3941,8 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 "Bu se�enek POP sunucuya �ifreli APOP protokol�n� kullanarak ba�lant� kurar."
 
@@ -4090,7 +3998,7 @@ msgstr ""
 "POP sunucusuyla ba�lant� kurulamad�.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
@@ -4140,11 +4048,11 @@ msgstr "sendmail %d durumu ile ��kt�: ileti g�nderilemedi."
 msgid "Could not find 'From' address in message"
 msgstr "Mesajda 'From' adresi bulunamad�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail �zerinden ileti g�nderimi"
 
@@ -4156,120 +4064,132 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP �zerinden bir sunucuya ba�lan�p e-postalar�n�z� g�ndermek i�in.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+#, fuzzy
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr "SMTP �zerinden bir sunucuya ba�lan�p e-postalar�n�z� g�ndermek i�in.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr "�mla hatas�, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da arg�manlarda imla hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr "Komut hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yard�m yan�t�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr "Yard�m mesaj�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr "Servis haz�r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr "Servis ileti�im kanal�n� kapat�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr "Servis uygun de�il, ileti�im kanal� kapat�l�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr "�stenen ileti i�lemi tamamland�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr "Kullan�c� yerel de�il, <forward-path> �zerine g�nderilecek"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "�stenen ileti eylemi yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�stenen eylem yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr "�stenen eylem iptal edildi: i�lem s�ras�nda hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr "Kullan�c� yerel de�il; l�tfen <forward-path> deneyin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr "�stenen eylem yap�lmad�: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "�stenen eylem iptal edildi: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "�stenen eylem yap�lmad�: e-posta kutusu izni yok"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "�leti ba�lang�c�n� girin, <CRLF>.<CRLF> ile bitirin."
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr "�leti�im kurulamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik s�nama y�ntemi �ok zay�f"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr "�stenen kimlik s�nama y�ntemi i�in �ifreleme gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Ge�ici kimlik denetim hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Giri� hatas�: %s: �nemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sL�tfen %s@%s i�in SMTP parolas�n� giriniz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Kimlik denetime gerek yok:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 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."
@@ -4277,104 +4197,105 @@ msgstr ""
 "Bu se�enek SMTP sunucuya herhangi bir kimlik s�nama i�lemi kullanmadan "
 "ba�lanacakt�r. Pek �ok SMTP sunucular i�in ge�erli bir y�ntemdir."
 
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s �zerinden STMP ileti g�nderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "�leti g�nderilemiyor: g�nderen adresi tan�ml� de�il."
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "�leti g�nderilemiyor: g�nderen adresi ge�ersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH iste�i zaman a��m�na u�rad�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO zaman a��m�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA iste�i zaman a��m�na u�rad�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA g�nderimi zaman a��m�na u�rad�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET iste�i zaman a��m�na u�rad�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cevap hatas�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT iste�i zaman a��m�na u�rad�: %s: �nemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT cevap hatas�: %s: �nemsiz"
@@ -4413,11 +4334,6 @@ msgstr "ek"
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
-#: 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
-msgid "Remove"
-msgstr "Sil"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Se�ili dosyalar� ekler listesinden sil"
@@ -4431,6 +4347,7 @@ msgid "Attach a file to the message"
 msgstr "�letiyi bir dosya ekle"
 
 #: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Ek"
 
@@ -4461,38 +4378,45 @@ msgstr "Adres defteri i�in buraya t�klay�n"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Kimden:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Cevapla:"
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:635
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Kime:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "�letinin g�nderildi�i ki�iler"
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�letinin kopyas�n�n g�nderilecek olundu�u adresler"
 
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4523,12 +4447,12 @@ msgstr "%s dosyas�n� kaydederken hata oldu"
 msgid "Error loading file: %s"
 msgstr "`%s' dosyas�n� y�klerken hata oldu"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4537,27 +4461,27 @@ msgstr ""
 "Bu ileti g�nderilmedi.\n"
 "De�i�iklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Dosyay� a�"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "B�yle bir dosya yok ."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Bu normal bir dosya de�ildir ."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Bu dosya vard�r ama okunabilir de�il ."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 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:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4565,15 +4489,15 @@ msgstr ""
 "Bu dosya �ok b�y�k (100 KB'den b�y�k!).\n"
 "Ger�ekten kullanmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Dosyay� okurken bir hata oldu."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "Mektup g�nderme penceresi a��lamad�."
 
@@ -4587,6 +4511,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution posta program� a��lamad�."
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolution kitlesel i�lemler uygulamas�"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "adres kart�"
@@ -4920,29 +4848,20 @@ msgstr "�imdi"
 msgid "<click here to select a date>"
 msgstr "<bir tarih se�mek i�in t�klay�n�z>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "Filtre Kural� Ekle"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Filtre Kural�n� D�zenle"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filtreleri D�zenle"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Filtre Kurallar�"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Sonra"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Eylem ekle"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Eylemi sil"
 
@@ -4979,35 +4898,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Kural ad�:"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "�simsiz"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "E�er"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Eylemleri i�let"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "t�m kriterler sa�lan�rsa"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter sa�lan�rsa"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "S�n�f ekle"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "S�n�flar� sil"
 
@@ -5015,8 +4934,8 @@ msgstr "S�n�flar� sil"
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "�nemli"
@@ -5025,14 +4944,14 @@ msgstr "�nemli"
 msgid "Read"
 msgstr "Oku"
 
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filtreleri D�zenle"
+
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "VFolder D�zenle"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Filtre Kurallar�"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Gelen"
@@ -5041,7 +4960,7 @@ msgstr "Gelen"
 msgid "Outgoing"
 msgstr "Giden"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "Sanal Dizinler"
 
@@ -5065,237 +4984,197 @@ msgstr "t�m yerel ve etkin uzak dizinlerle birlikte"
 msgid "with all local folders"
 msgstr "t�m yerel dizinlerle birlikte"
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr "Cevaplanan"
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Renk Belirt"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Puan Belirt"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Ek"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "i�erir"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Al�nma tarihi"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "G�nderilme tarihi"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Silinen"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "i�ermez"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Taslak"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr "sonlanmaz"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr "benzemez"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr "ba�lamaz"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr "biter"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "��_k"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
+msgstr "bulunur"
+
+#: filter/libfilter-i18n.h:21
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
-msgstr "��aretli"
-
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr "Adrese �let"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr " "
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "b�y�k"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "k���k"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "de�il"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr "�leti G�vdesi"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "�leti Ba�l���"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "�leti al�nd�"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "�leti g�nderildi"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Dizine Ta��"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr "birlikte ya da sonra"
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr "birlikte ya da �nce"
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Al�c�lar"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr "D�zg�n Deyim E�le�imi"
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr "G�r�nen"
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
+#: filter/libfilter-i18n.h:39
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
+msgstr "benzer"
+
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Kaynak"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr "�zel ba�l�k"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr "ba�layan"
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr "��lemeyi Durdur"
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Konu"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "i�erir"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "i�ermez"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr "sonlanmaz"
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "bulunmaz"
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr "benzemez"
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr "ba�lamaz"
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr "biter"
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr "bulunur"
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr " "
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "b�y�k"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "k���k"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "de�il"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr "birlikte ya da sonra"
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr "birlikte ya da �nce"
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr "benzer"
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr "ba�layan"
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "daha �nce"
 
-#: filter/libfilter-i18n.h:159
+#: filter/libfilter-i18n.h:48
 msgid "was before"
 msgstr "daha sonra"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "Kural Ekle"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
 msgstr "Kaynak Kural�n� D�zenle"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "VFolder Kural� Ekle"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "VFolder Kural�n� D�zenle"
-
-#: mail/component-factory.c:303
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Depo kabu�a kay�t ettirilemedi"
 
-#: mail/folder-browser-factory.c:211
+#: mail/folder-browser-factory.c:237
+#, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �zellikleri"
 
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "�zellikler"
@@ -5304,81 +5183,81 @@ msgstr "�zellikler"
 msgid "Store search as vFolder"
 msgstr "Kayd� vFolder �eklinde kaydet"
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr "Konuya G�re VFolder"
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr "G�nderene G�re VFolder"
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr "Al�c�lara G�re VFolder"
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr "E-posta Listesi �zerinde VFolder"
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr "Konuya G�re Filtreleme"
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr "G�ndericiye G�re Filtreleme"
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr "Al�c�lara G�re Filtreleme"
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr "E-posta Listelerine G�re Filtreleme"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Farkl� Kaydet..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:30 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Yazd�r"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "G�nderene Cevapla"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "T�m�ne cevapla"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "�let"
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr "�evrimi�i ilet"
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Okunmu� Olarak ��aretle"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Okunmam�� Olarak ��aretle"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Dizine Ta��..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Dizine Kopyala..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Silme"
 
@@ -5386,20 +5265,21 @@ msgstr "Silme"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr "Mesajdan Bir Kural Yarat"
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
+#, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "E-posta Listesi �zerinde VFolder (%s)"
 
@@ -5435,22 +5315,6 @@ msgstr "Evolution e-posta bile�en mimarisi."
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express 4 dosyalar�n� Evolution'a aktar�r"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "mbox dosyalar�n� Evolution'a aktar�r."
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "G�ncel depolama bi�imi:"
@@ -5536,6 +5400,10 @@ msgstr "%s'ten E-posta"
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Filtre Kural� Ekle"
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5589,19 +5457,19 @@ msgstr "Bu e-postay� g�ndermek i�in al�c�s�n� belirtmeniz gereklidir."
 msgid "On %s, %s wrote:\n"
 msgstr "%s tarihinde, %s dedi ki:\n"
 
-#: mail/mail-callbacks.c:737
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "�letilen mesaj:\n"
 
-#: mail/mail-callbacks.c:822
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "�letileri buraya ta��"
 
-#: mail/mail-callbacks.c:824
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "�leti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:965
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5609,11 +5477,11 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "mesajlar� d�zenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:998 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Dosya �zerine yaz�ls�n m�?"
 
-#: mail/mail-callbacks.c:1002 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5621,15 +5489,15 @@ msgstr ""
 "Ayn� isimde bir dosya zaten var\n"
 "�zerine yaz�ls�n m�?"
 
-#: mail/mail-callbacks.c:1046
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "�letiyi Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "�letileri Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5638,11 +5506,11 @@ msgstr ""
 "Filtre bilgisini y�klerken hata olu�tu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1205
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "�letiyi Yazd�r"
 
-#: mail/mail-callbacks.c:1252
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "�letiyi yazd�r�lmas�nda hata"
 
@@ -5866,8 +5734,8 @@ msgstr "T�r"
 
 #: mail/mail-config.glade.h:74
 msgid ""
-"Type the name by which you would like to refer to these servers. For example: "
-"\"Work\" or \"Home\"."
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 msgstr ""
 "Bu sunucular� hangi isimle tan�mlamak istedi�inizi belirtiniz (�rnek olarak "
 "\"��\" ya da \"Ev\"."
@@ -5891,7 +5759,7 @@ msgstr ""
 "Devam etmek i�in \"�leri\" d��mesine t�klay�n."
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "_D�zenle"
@@ -5967,96 +5835,97 @@ msgstr "Gizle"
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Cevapla:"
-
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Mesaj i�eri�i y�kleniyor"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "�ifrelenmi� ileti g�sterilemiyor"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "�ifrelenmi� ileti"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "�ifreyi a�mak i�in simgeye t�klay�n"
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1406
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu mesaj dijital olarak imzalanm��t�r ve g�venlidir."
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1414
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu mesaj dijital olarak imzalanm��, fakat g�venli oldu�u kan�tlanmam��t�r."
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine ba� (%s)"
 
-#: mail/mail-format.c:1639
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "%s yerel dosyas�na ba� (\"%s\" adresinde ge�erli)"
 
-#: mail/mail-format.c:1643
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya ba� (%s)"
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye ba� (\"%s\" t�r�nde)"
 
-#: mail/mail-format.c:1682
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Bozuk harici g�vde"
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Bu isimde bir dizin yok: `%s'"
+
+#: mail/mail-local.c:508
+#, c-format
 msgid "Opening '%s'"
 msgstr "'%s' a��l�yor"
 
-#: mail/mail-local.c:743
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�iliyor"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�"
 
-#: mail/mail-local.c:771
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yap�land�r�l�yor"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:800
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Ge�erli dizin kapat�l�yor"
 
-#: mail/mail-local.c:832
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Yeni dizinin ad� de�i�tiriliyor ve a��l�yor"
 
-#: mail/mail-local.c:850
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Yeni dizin yarat�l�yor"
 
-#: mail/mail-local.c:864
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "�letiler kopyalan�yor"
 
-#: mail/mail-local.c:885
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6065,7 +5934,7 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. B�y�k ihtimalle bu dizini \n"
 "yeniden a�amayacaks�n�z: %s"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6091,11 +5960,15 @@ msgstr ""
 "��lem s�ras�nda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:789
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr "�al���yor"
 
-#: mail/mail-mt.c:771
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr ""
+
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr ""
 
@@ -6108,73 +5981,75 @@ msgstr "\"%s\" g�nderiliyor"
 msgid "Sending message"
 msgstr "�leti g�nderiliyor"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:752
 msgid "Saving message to folder"
 msgstr "�letiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
+#, c-format
 msgid "Moving messages to %s"
 msgstr "�letiler %s'e ta��n�yor"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:825
+#, c-format
 msgid "Copying messages to %s"
 msgstr "�letiler %s'e kopyalan�yor"
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Ta��n�yor"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopyalan�yor"
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s ileti %d/%d (uid \"%s\")"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" i�inde dizinler taran�yor"
 
-#: mail/mail-ops.c:1066
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "�letilen mesajlar"
 
-#: mail/mail-ops.c:1107 mail/mail-ops.c:1245
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini a��l�yor"
 
-#: mail/mail-ops.c:1174
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu a��l�yor"
 
-#: mail/mail-ops.c:1361
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi al�n�yor"
 
-#: mail/mail-ops.c:1477
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "�letiler al�n�yor"
 
-#: mail/mail-ops.c:1487
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "%d/%d mesaj al�n�yor (uid \"%s\")"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "�letiler kaydediliyor"
 
-#: mail/mail-ops.c:1640
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6183,12 +6058,12 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
 
-#: mail/mail-ops.c:1667
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6197,11 +6072,11 @@ msgstr ""
 "�letilerin kayd�nda hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:1756
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6210,7 +6085,7 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1784
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yaz�lamad�: %s."
@@ -6260,24 +6135,31 @@ msgstr "T�nellemeden bozuk bir ileti geldi!"
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ge�ici ileti kutusu '%s' haz�rlanamad�: %s"
 
-#: mail/mail-tools.c:191
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (iletilen e-posta)"
 
-#: mail/mail-tools.c:201
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "�lt: (konusuz)"
 
-#: mail/mail-tools.c:218
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "�letilen e-posta - %s"
 
-#: mail/mail-tools.c:220
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "�letilen e-posta (konusuz)"
 
+#: mail/mail-tools.c:411
+#, c-format
+msgid ""
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr ""
+
 #: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VDizin"
@@ -6288,23 +6170,23 @@ msgstr "Yeni VDizin"
 
 #. 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 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "�letiyi g�nderene cevap ver"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "�letinin t�m al�c�lar�na cevap ver"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Bu e-postay� ilet"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Se�ili iletiyi yazd�r"
 
@@ -6312,18 +6194,18 @@ msgstr "Se�ili iletiyi yazd�r"
 msgid "Delete this message"
 msgstr "Bu iletiyi sil"
 
-#: mail/mail-vtrash.c:97
-msgid "Opening Trash folder for %s"
-msgstr "%s i�in ��p dizini a��l�yor"
-
-#: mail/mail-vtrash.c:106
-msgid "Getting matches"
-msgstr "E�lenenler al�n�yor"
-
 #: mail/message-list.c:618
 msgid "Unseen"
 msgstr "G�r�nmeyen"
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr "G�r�nen"
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr "Cevaplanan"
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "�oklu G�r�lmeyen Mesaj"
@@ -6371,6 +6253,10 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr "��aretli"
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Kimden"
@@ -6449,6 +6335,7 @@ msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" dizinine �ye olunuyor"
 
 #: mail/subscribe-dialog.c:282
+#, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden �yelik siliniyor"
 
@@ -6550,8 +6437,8 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Evolution'a aktarmak istedi�iniz dosyay� se�in ve listenin bu dosyan�n t�r�n� "
-"belirleyin.\n"
+"Evolution'a aktarmak istedi�iniz dosyay� se�in ve listenin bu dosyan�n "
+"t�r�n� belirleyin.\n"
 "\n"
 "E�er dosya t�r�n� bilmiyorsan�z \"Otomatik\" se�ene�ini i�aretleyin. Bu "
 "durumda Evolution dosya t�r�n� bulmaya �al��acakt�r."
@@ -6734,7 +6621,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kay�t kurulamad� -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6821,7 +6708,7 @@ msgid "Error saving shortcuts."
 msgstr "K�sayollar� kaydederken hata oldu."
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_G�ster"
@@ -6882,7 +6769,8 @@ msgstr "Bu kay�tta belirtilen tip desteklenmiyor"
 msgid "The Evolution shell."
 msgstr "Evolution kabu�u."
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6907,7 +6795,7 @@ msgstr ""
 "Evolution geni� bir geli�tirici grubu taraf�ndan haz�rlanmaktad�r. Sizlerin "
 "de deste�ini bekliyoruz.\n"
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6915,15 +6803,15 @@ msgstr ""
 "Te�ekk�rler\n"
 "Evolution Tak�m�\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution kabu�u ba�lat�lamad�."
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Etkisizle�tir."
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo par�alar sistemi ba�lat�lamad�."
 
@@ -6948,7 +6836,7 @@ msgid "New contact"
 msgstr "Yeni ba�lant�"
 
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Yazd�r�lacak olan mesaj� �nizler"
 
@@ -6956,7 +6844,7 @@ msgstr "Yazd�r�lacak olan mesaj� �nizler"
 msgid "Print contacts"
 msgstr "Ba�lant�lar� yazd�r"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Dur"
 
@@ -6990,7 +6878,7 @@ msgid "_Search for contacts"
 msgstr "Ba�_lant�lar� ara"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:75
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "_Ara�lar"
@@ -7110,7 +6998,7 @@ msgstr "_Yeni"
 msgid "_Open Calendar"
 msgstr "_Takvimi A�"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:72
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "_Farkl� Kaydet..."
@@ -7137,7 +7025,7 @@ msgid "Print this item"
 msgstr "Bu ��eyi yazd�r"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:34 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Yazd�r..."
 
@@ -7169,13 +7057,13 @@ msgid "Send _message to contact..."
 msgstr "Ba�lant�ya _mesaj g�nder..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Dosya"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Kaydet"
@@ -7314,7 +7202,7 @@ msgid "Print Setup"
 msgstr "Yazd�rma Ayarlar�"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Kaydet"
 
@@ -7351,12 +7239,12 @@ msgstr "G�ncel yaz�c� i�in sayfa ayarlar�n� yap"
 msgid "Task _Request (FIXME)"
 msgstr "G�rev �_ste�i (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Hakk�nda..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Kapat"
@@ -7370,12 +7258,12 @@ msgstr "_Ba�lant� (FIXME)"
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Hata ay�kla"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Yard�m"
@@ -7413,7 +7301,7 @@ msgstr "_Yap��t�r"
 msgid "_Print"
 msgstr "_Yazd�r"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "�_zellikler..."
@@ -7451,10 +7339,6 @@ msgstr "Genel �zet Ayarlar�..."
 msgid "New Mail"
 msgstr "Yeni �leti"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Attachment (FIXME: implement me)"
-msgstr "Ek"
-
 #: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "D�zenle"
@@ -7476,207 +7360,213 @@ msgid "Display all of the message headers"
 msgstr "T�m mesaj ba�l���n� g�ster"
 
 #: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "G�revi D�zenle"
+
+#: ui/evolution-mail.xml.h:11
 msgid "Filter on Se_nder"
 msgstr "_G�ndericiye G�re Filtreleme"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:12
 msgid "Filter on _Recipients"
 msgstr "_Al�c�lara G�re Filtreleme"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:13
 msgid "Filter on _Subject"
 msgstr "_Konuya G�re Filtreleme"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Parolalar� _Unut"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:16
 msgid "Forward As"
 msgstr "Farkl� �let"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:18
 msgid "Full Headers"
 msgstr "Kapsaml� Ba�l�klar"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Se�ili Mesajlar� Gizle"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "_Silenen mesajlar� gizle"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "_Okunan mesajlar� gizle"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
 msgid "Inline"
 msgstr "�zle"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:23
 msgid "Manage _Subscriptions..."
 msgstr "�yelikleri _D�zenle..."
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:24
 msgid "Mar_k as Read"
 msgstr "_Okunmu� Olarak ��aretle"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
 msgid "Mark All as R_ead"
 msgstr "_T�m�n� Okunmu� Olarak ��aretle"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:26
 msgid "Mark as U_nread"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:27
 msgid "Message _Display"
 msgstr "�leti _G�r�n�m�"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Ta��"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Mesajlar� yeni dizine ta��"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Mesaj� yaz�c�ya g�nder"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Quoted (FIXME: implement me)"
-msgstr ""
-
 #: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "Not"
+
+#: ui/evolution-mail.xml.h:37
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _All"
 msgstr "_T�m�ne Cevapla"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "_Kaynak"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "T�m�n� _Se�"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:45
 msgid "Select _Thread"
 msgstr "Konumu _Se�"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:46
 msgid "Send and Receive"
 msgstr "Al ve G�nder"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Kuyruktaki iletileri g�nder ve yeni iletileri al"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:48
 msgid "Show _All"
 msgstr "_T�m�n� G�ster"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Konumland�r�lan Mesaj listesi"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "_G�nderene G�re VFolder"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "_Al�c�lara G�re VFolder"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:53
 msgid "VFolder on _Subject"
 msgstr "_Konuya G�re VFolder"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Ham Mesaj Kayna��n� �zle"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:55
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _D�zenleyici..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:56
 msgid "_Actions"
 msgstr "E_ylemler"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "_Filtreleri Uygula"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:58
 msgid "_Compose"
 msgstr "_D�zenle"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:60
 msgid "_Create Filter From Message"
 msgstr "_Mesajdan Bir Filtre Yarat"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:63
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
 msgid "_Folder"
 msgstr "_Dizin"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "�_let"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "S_e�imi Tersine �evir"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:67
 msgid "_Mail Message"
 msgstr "_Mesaj� G�nder"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:68
 msgid "_Mail Settings..."
 msgstr "E-posta Ayarlar�..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:69
 msgid "_Message Hiding"
 msgstr "_Mesaj Saklama"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "_Dizine Ta��..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:71
 msgid "_Open Selected Items"
 msgstr "_Se�ili ��eleri A�"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:74
 msgid "_Send and Receive"
 msgstr "_Al ve G�nder"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "_Konumlu"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "_Silme"
 
@@ -7800,31 +7690,41 @@ msgstr "Dizin �ubu�unu g�ster/gizle"
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Dizin �ubu�unu g�ster/gizle"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Dizin �ubu�unu g�ster/gizle"
+
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc Alan�"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc Alan�"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_Kimden Alan�"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Metin dosyas� ekle..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_A�..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Cevapla:"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_G�venlik"
 
@@ -8147,6 +8047,11 @@ msgstr "Toplant� _biti� saati:"
 msgid "All Attendees"
 msgstr "T�m Kat�l�mc�lar"
 
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "Kart G�r�n�m�"
+
 #. 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
@@ -8203,15 +8108,15 @@ msgstr "Tarih hatal�"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Aramay� Kaydet"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Geli�mi� Arama"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Geli�mi� ..."
 
@@ -8260,6 +8165,133 @@ msgstr "init_corba(): GNOME ba�lat�lamad�"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution kitlesel i�lemler uygulamas�"
+#~ msgid "Disabled"
+#~ msgstr "Etkisiz"
+
+#~ msgid "Synchronize"
+#~ msgstr "E�zamanla"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Pilot'tan Kopyala"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Pilot'a Kopyala"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Pilot'tan Birle�tir"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Pilot'a Birle�tir"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Original Author:"
+#~ msgstr "Programc�(lar):"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "Evolution Addressbook Conduit"
+#~ msgstr "Evolution Adres Defteri"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 Free Software Foundation ve Helix Code"
+
+#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
+#~ msgstr "Evolution adres defteri yap�land�rma program�\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "��lemi E�zamanla"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Ayarl� pilot yok. L�tfen 'Pilot Ba�lant�\n"
+#~ "�zellikleri' b�l�m�ne gidiniz."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "gnome-pilot program�na ba�lant� kurulmad�"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "gnome-pilot program�ndan pilot listesi\n"
+#~ "al�n�rken bir hata olu�tu"
+
+#~ msgid "Configure the address conduit"
+#~ msgstr "Adres par�as�n�n ayarlar�"
+
+#~ msgid "Evolution Address conduit "
+#~ msgstr "Adres par�as�"
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Evolution Takvimi"
+
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr "Evolution takvimi i�in yap�land�rma program�\n"
+
+#~ msgid "Configure the GnomeCal conduit"
+#~ msgstr "GnomeCal takvim par�as� ayarlar�"
+
+#~ msgid "Evolution Calendar conduit"
+#~ msgstr "Takvim par�as�"
+
+#~ msgid "Configure the todo conduit"
+#~ msgstr "Yap�lacaklar par�as� ayarlar�"
+
+#~ msgid "Evolution ToDo conduit "
+#~ msgstr "Yap�lacaklar par�as�"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Evolution Yap�lacaklar"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Evolution Yap�lacaklar i�in yap�land�rma program�.\n"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Filtre Kural�n� D�zenle"
+
+#~ msgid "Deleted"
+#~ msgstr "Silinen"
+
+#~ msgid "Draft"
+#~ msgstr "Taslak"
+
+#~ msgid "Add Rule"
+#~ msgstr "Kural Ekle"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "VFolder Kural� Ekle"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "VFolder Kural�n� D�zenle"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Outlook Express 4 dosyalar�n� Evolution'a aktar�r"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "mbox dosyalar�n� Evolution'a aktar�r."
+
+#~ msgid "Opening Trash folder for %s"
+#~ msgstr "%s i�in ��p dizini a��l�yor"
+
+#~ msgid "Getting matches"
+#~ msgstr "E�lenenler al�n�yor"
+
+#~ msgid "Attachment (FIXME: implement me)"
+#~ msgstr "Ek"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ec45ae5c65..9c8ae7bb51 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-15  Pablo Saratxaga  <pablo�mandrakesoft.com>
+
+	* main.c: fixed a no-c-format tag
+
 2001-03-14  Ettore Perazzoli  <ettore@ximian.com>
 
 	* importer/Makefile.am (INCLUDES): Remove `-g Wall' and friends.
diff --git a/shell/main.c b/shell/main.c
index 3f98fd85b1..de3bd81816 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -68,10 +68,9 @@ development_warning (void)
 		"Evolution" VERSION,
 		GNOME_STOCK_BUTTON_OK,
 		NULL);
-/* xgettext:no-c-format */
 	label = gtk_label_new (
-		_(
-		  "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+		/* xgettext:no-c-format */
+		_("Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 		  "of the Evolution groupware suite.\n"
 		  "\n"
 		  "Evolution is not yet complete. It's getting close, but there are\n"